more fixes hall a1

1 files changed, 17 insertions, 17 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index d866593..9d4908a 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -67,13 +67,13 @@ class CHallState(CGameState):
         self.mBackground = CImage.loadImage('assets/images/hall/A1-Pasillo-1.png', False)
         CGame().setBackground(self.mBackground)
         
-        self.mArea1 = CSprite()        
-        self.mArea1.setXY(402,96)
-        self.mFrameDoor0101.append(Image.loadImage('assets/images/hall/door0101_normal.png', True))
-        self.mFrameDoor0101.append(Image.loadImage('assets/images/hall/door0101_selected.png', True))
-        self.mArea1.setImage(self.mFrameDoor0101[0])
-        CGame().addChild(self.mArea1)
         
+        self.mDoor = CSprite()
+        self.mDoor.setXY(400, 50)
+        self.mFrameImageDoor = Image.loadImage('assets/images/hall/A1-puerta-resaltada.png', True)
+        self.mDoor.setImage(self.mFrameImageDoor)
+        self.mDoorIs = False
+                
         self.mPlayer = CBoyHall()
         CGame().addChild(self.mPlayer)
         
@@ -103,18 +103,18 @@ class CHallState(CGameState):
             CGame().setState(ms)
             return
         
-        #if (self.mArea1 <> None):
         if (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)):
-            self.mArea1.setImage(self.mFrameDoor0101[1])
-            if (CMouse().firstPress()):
+            if not(self.mDoorIs):
+                CGame().addChild(self.mDoor)
+                self.mDoorIs = True
+            if (CMouse().release()):
                 a1g1 = CArea1Game1()
                 CGame().setState(a1g1)
         else:
-            self.mArea1.setImage(self.mFrameDoor0101[0])
-        
-    #def render(self):
-    #    CGameState.render(self)
-    #    print "CMenuState render"
+            if self.mDoorIs:
+                CGame().removeChild(self.mDoor)
+                self.mDoorIs = False
+
         
     def destroy(self):
         #CGame().removeChild(self.mText)
@@ -122,9 +122,9 @@ class CHallState(CGameState):
         CGameState.destroy(self)
         CGame().removeChild(self.mButtonBack)
         self.mButtonBack = None
-        CGame().removeChild(self.mArea1)
-        self.mArea1.destroy()
-        self.mArea1 = None
+        CGame().removeChild(self.mDoor)
+        #self.mDoor.destroy()
+        self.mDoor = None
         CGame().removeChild(self.mPlayer)
         self.mPlayer.destroy()
         self.mPlayer = None