Fix skip_player implementation.

diff --git a/naja/actions.py b/naja/actions.py
index 431b126829a1d48b401fdb5e3e288c5406a9a0dc..07d9d0a14bc86dc3cecefbf4e8c1b3f383563629 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -295,7 +295,7 @@ class ShiftLocations(LocationAction):
         sound.play_sound('grind.ogg')
         board.shift_locations(
             self.data['direction'],
         sound.play_sound('grind.ogg')
         board.shift_locations(
             self.data['direction'],

-            self.data.get('skip_player', False))
+            self.data.get('skip_current', True))

 
 
 class RotateLocations(LocationAction):
 
 
 class RotateLocations(LocationAction):

diff --git a/naja/gameboard.py b/naja/gameboard.py
index f17a129742fb810cc91055cc24d68a2efcfb065e..894f2b31f052b1464a6cdb1876187a5aefc8d55c 100644 (file)
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -215,7 +215,7 @@ class GameBoard(object):
             if skip_player and (px, py) == mkpos(i):
                 continue
             new_i = (i + change) % 5
             if skip_player and (px, py) == mkpos(i):
                 continue
             new_i = (i + change) % 5

-            if (px, py) == mkpos(new_i):
+            if skip_player and (px, py) == mkpos(new_i):

                 new_i = (new_i + change) % 5
             shifted_locations[mkpos(new_i)] = self.board_locations[mkpos(i)]
 
                 new_i = (new_i + change) % 5
             shifted_locations[mkpos(new_i)] = self.board_locations[mkpos(i)]