anim player before enter to game

1 files changed, 42 insertions, 18 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index 2871e25..06ed4e8 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -18,23 +18,26 @@ from Area1Game1 import CArea1Game1
 from gettext import gettext as _
 
 class CHallState(CGameState):
-
-    mBackground = None
-    mBackgroundList = []
-    mInstructions = None
-    #mX = 10
-    mButtonBack = None
-    
-    mCurrentSelectedArea = 0
-
-    AREA1_POLYGON = [(424,90), (764,90), (764, 700), (424,700)]
+ 
+    def init(self):
+        CGameState.init(self)
         
-    mPlayer = None    
+        self.mBackground = None
+        self.mBackgroundList = []
+        self.mInstructions = None
+        #mX = 10
+        self.mButtonBack = None
+        
+        self.mCurrentSelectedArea = 0
     
-    mtext = None
+        self.AREA1_POLYGON = [(424,90), (764,90), (764, 700), (424,700)]
+            
+        self.mPlayer = None    
         
-    def init(self):
-        CGameState.init(self)
+        self.mtext = None
+        
+        self.mGo = None
+    
         #self.mInstructions = CMultiLabel()
         #CGame().addChild(self.mInstructions)
         #print self.mX
@@ -83,6 +86,7 @@ class CHallState(CGameState):
         CGame().addChild(self.mRightArrow)
 
         
+        
     def update(self):
         #print "menu update"
         CGameState.update(self)
@@ -112,6 +116,7 @@ class CHallState(CGameState):
             self.mPlayer.setXY(1400, 500)
             
             CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
+            return
             
         elif self.mRightArrow.clicked():
             print 'next game'
@@ -130,20 +135,39 @@ class CHallState(CGameState):
             self.mPlayer.setXY(-200, 500)
             
             CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
+            return
         
-        elif (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)):
+        if (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)):
             if not(self.mDoorIs):
                 CGame().addChild(self.mDoor)
                 self.mDoorIs = True
             if (CMouse().release()):
-                if self.mCurrentSelectedArea == 0:
-                    a1g1 = CArea1Game1()
-                    CGame().setState(a1g1)
+                x = CMouse().getX() - self.mPlayer.getX()
+
+                self.mPlayer.mDestX = 600
+                if x < 0:
+                    self.mPlayer.setImage(self.mPlayer.mFrameImage[3])
+                    self.mPlayer.mAnim.init(6, 5, True, 3)
+                    self.mPlayer.mLastSense = 0
+                else:
+                    self.mPlayer.setImage(self.mPlayer.mFrameImage[0])
+                    self.mPlayer.mAnim.init(3, 5, True, 0)
+                    self.mPlayer.mLastSense = 1
+
+                self.mGo = self.mCurrentSelectedArea
                 
         else:
             if self.mDoorIs:
                 CGame().removeChild(self.mDoor)
                 self.mDoorIs = False
+        
+        if self.mGo is not None:
+            x = self.mPlayer.getX()
+            if (x > 400) and (x < 600):
+                if self.mGo == 0:
+                    a1g1 = CArea1Game1()
+                    CGame().setState(a1g1)
+                
 
     def setPartida(self, aPartida):
         self.mPartida = aPartida