gnome-games r7382 - in trunk/glchess: . src/lib

[rancell svn gnome org]

Author: rancell
Date: Sat Feb 16 09:35:59 2008
New Revision: 7382
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7382&view=rev

Log:
Fix wrong player moving when changing to 3D mode (Bug #516818)



Modified:
   trunk/glchess/ChangeLog
   trunk/glchess/src/lib/display.py

Modified: trunk/glchess/src/lib/display.py
==============================================================================
--- trunk/glchess/src/lib/display.py	(original)
+++ trunk/glchess/src/lib/display.py	Sat Feb 16 09:35:59 2008
@@ -186,8 +186,8 @@
         self.pieces = {}
 
         # Call parent constructors
-        scene.human.SceneHumanInput.__init__(self)
         self.controller = scene.opengl.Scene(self)
+        scene.human.SceneHumanInput.__init__(self)
 
     def getPieces(self):
         return self.pieces.values()
@@ -236,6 +236,10 @@
         """Called by scene.human.SceneHumanInput"""
         return self.playerIsHuman() and self.game.squareIsFriendly(coord)
     
+    def canMove(self, start, end):
+        """Called by scene.human.SceneHumanInput"""
+        return self.playerIsHuman() and self.game.getCurrentPlayer().canMove(start, end) # FIXME: Promotion type
+    
     def selectSquare(self, coord):
         """Called by scene.human.SceneHumanInput"""
         self.view.setSelectedSquare(coord)
@@ -426,7 +430,7 @@
         self._redrawHighlight()
         
         # If waiting for this piece then end players turn
-        if piece is self.scene.waitingPiece:
+        if piece is not None and piece is self.scene.waitingPiece:
             self.scene.waitingPiece = None
             self.game.getCurrentPlayer().endMove()