update back button in hall

1 files changed, 27 insertions, 20 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index 04e9ee3..359940f 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -5,7 +5,6 @@ import SelectAreaState
 # import CSelectAreaState
 from api.GameState import CGameState
 from api.Game import CGame
-from api.Button import CButton
 import api.Image as CImage
 from api.Sprite2 import CSprite
 import api.Image as Image
@@ -14,7 +13,6 @@ import api.Math as CMath
 from BoyHall import CBoyHall
 from Area1Game1 import CArea1Game1
 
-from gettext import gettext as _
 
 class CHallState(CGameState):
  
@@ -26,32 +24,28 @@ class CHallState(CGameState):
         self.mInstructions = None
         #mX = 10
         self.mButtonBack = None
-        
+        self.mBsetted = False
+        self.mNsetted = True        
         self.mCurrentSelectedArea = 0
-    
-        self.AREA1_POLYGON = [(424,90), (764,90), (764, 700), (424,700)]
-            
         self.mPlayer = None    
-        
         self.mtext = None
-        
         self.mGo = None
     
-        #self.mInstructions = CMultiLabel()
-        #CGame().addChild(self.mInstructions)
-        #print self.mX
+        self.AREA1_POLYGON = [(424,90), (764,90), (764, 700), (424,700)]
+
         
         self.mPartida = None
         self.mAreaStates = []
         
         self.mCurrentSelectedArea = 0
         
-        self.mButtonBack = CButton()
-        self.mButtonBack.set_bgColor((0x99, 0x99, 0x66))
-        self.mButtonBack.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
-        self.mButtonBack.set_center((100, 100))
-        self.mButtonBack.set_size((200, 40))  
-        self.mButtonBack.set_text(_("Volver"))
+        self.mBackImageN = Image.loadImage('assets/images/back.png')
+        self.mBackImageB = Image.loadImage('assets/images/back_big.png')
+        
+        self.mButtonBack = CSprite()
+        self.mButtonBack.setRegistrationPointOffset(22, 22)
+        self.mButtonBack.setXY(1170, 30)
+        self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
         self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-1.jpg', False))
@@ -88,9 +82,22 @@ class CHallState(CGameState):
     def update(self):
         #print "menu update"
         CGameState.update(self)
+        
+        if self.mButtonBack.mouseOver():
+            if not(self.mBsetted):
+                self.mBsetted = True
+                self.mNsetted = False
+                self.mButtonBack.setRegistrationPointOffset(27, 27)
+                self.mButtonBack.setImage(self.mBackImageB)
+        else:
+            if not(self.mNsetted):
+                self.mBsetted = False
+                self.mNSetted = True
+                self.mButtonBack.setRegistrationPointOffset(22, 22)
+                self.mButtonBack.setImage(self.mBackImageN)
        
         if self.mButtonBack.clicked():
-            print "clicked back......"
+            #print "clicked back......"
             #ms = MenuState.CMenuState()
             cs = SelectAreaState.CSelectAreaState()
             CGame().setState(cs)
@@ -98,7 +105,7 @@ class CHallState(CGameState):
             return
         
         elif self.mLeftArrow.clicked():
-            print 'previous game'
+            #print 'previous game'
             CGame().removeChild(self.mAreaStates[self.mCurrentSelectedArea])
             self.mCurrentSelectedArea = self.mCurrentSelectedArea - 1
             if self.mCurrentSelectedArea < 0:
@@ -117,7 +124,7 @@ class CHallState(CGameState):
             return
             
         elif self.mRightArrow.clicked():
-            print 'next game'
+            #print 'next game'
             CGame().removeChild(self.mAreaStates[self.mCurrentSelectedArea])
             self.mCurrentSelectedArea = self.mCurrentSelectedArea + 1
             if self.mCurrentSelectedArea > 5: