lot of changes and cleans due to CSprite and other things

1 files changed, 6 insertions, 13 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index bc4ca0a..377dcb2 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -2,7 +2,6 @@
 
 import pygame
 import SelectAreaState
-# import CSelectAreaState
 from api.GameState import CGameState
 from api.Game import CGame
 import api.Image as CImage
@@ -47,9 +46,8 @@ class CHallState(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
@@ -58,9 +56,8 @@ class CHallState(CGameState):
             img = CImage.loadImage(path, False)
             self.mBackgroundList.append(img)
        
-        self.mDoor = CSprite()
-        self.mDoor.setXY(400, 50)
-        self.mFrameImageDoor = Image.loadImage('assets/images/hall/A1-puerta-resaltada.png')
+        self.mDoor = CSprite(400, 50)
+        self.mFrameImageDoor = Image.loadImage('assets/images/hall/highlight_door.png')
         self.mDoor.setImage(self.mFrameImageDoor)
         
         self.mStar1 = Image.loadImage('assets/images/hall/star1.png')
@@ -71,14 +68,12 @@ class CHallState(CGameState):
         self.mSmallRightArrow = pygame.transform.flip(self.mSmallLeftArrow, True, False)
         self.mBigRightArrow = pygame.transform.flip(self.mBigLeftArrow, True, False)
         
-        self.mLeftArrow = CSprite()
-        self.mLeftArrow.setXY(75, 422)
+        self.mLeftArrow = CSprite(75, 422)
         self.mLeftArrow.setRegistrationPointOffset(55, 23)
         self.mLeftArrow.setImage(self.mSmallLeftArrow)
         CGame().addChild(self.mLeftArrow)
         
-        self.mRightArrow = CSprite()
-        self.mRightArrow.setXY(1125, 422)
+        self.mRightArrow = CSprite(1125, 422)
         self.mRightArrow.setRegistrationPointOffset(55, 23)
         self.mRightArrow.setImage(self.mSmallRightArrow)
         CGame().addChild(self.mRightArrow)
@@ -93,12 +88,11 @@ class CHallState(CGameState):
         #TODO no solo area 1
         a1 = par.getArea(1)
         for i in range(6):
-            s = CSprite()
+            s = CSprite(730, 40)
             if a1[i] == 0:
                 s.setImage(self.mStar1)
             else:
                 s.setImage(self.mStar2)
-            s.setXY(730, 40)
             self.mAreaStates.append(s)
         
         
@@ -108,7 +102,6 @@ class CHallState(CGameState):
         CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
         
     def update(self):
-        #print "menu update"
         CGameState.update(self)
         
         if self.mButtonBack.mouseOver():