Bit shifts!
[naja.git] / naja / gameboard.py
index 74abc12e5e82d763faf8f7dfb20df36745356fd4..7d8916ed9d328e0401bc6fff5dd2ed8ed7ad2270 100644 (file)
@@ -6,6 +6,7 @@ from naja.constants import(
 from naja.options import options
 from naja.player import Player
 from naja import actions
+from naja.sound import sound
 
 
 class GameBoard(object):
@@ -183,11 +184,10 @@ class GameBoard(object):
         if ROTATION[direction] == ROTATION.CLOCKWISE:
             new_positions = locations_to_rotate[1:] + [locations_to_rotate[0]]
         elif ROTATION[direction] == ROTATION.ANTICLOCKWISE:
-            new_positions = (
-                [locations_to_rotate[-1]] + locations_to_rotate[:-1])
+            new_positions = ([locations_to_rotate[-1]] + locations_to_rotate[:-1])
 
         for old, new in zip(locations_to_rotate, new_positions):
-            rotated_locations[old] = self.board_locations[new]
+            rotated_locations[new] = self.board_locations[old]
 
         self.board_locations.update(rotated_locations)
 
@@ -209,6 +209,7 @@ class GameBoard(object):
         from naja.events import SceneChangeEvent
         from naja.scenes.lose import LoseScene
         from naja.scenes.win import WinScene
+        sound.stop()
         if win:
             SceneChangeEvent.post(WinScene)
         else: