character of hall depends of cgame

5 files changed, 17 insertions, 9 deletions

diff --git a/src/assets/images/hall/Elisa-chica-costado-der.png b/src/assets/images/hall/Elisa-chica-costado-der.png
new file mode 100644
index 0000000..231e36c
--- /dev/null
+++ b/src/assets/images/hall/Elisa-chica-costado-der.png
diff --git a/src/assets/images/hall/Elisa-chica-costado-izq.png b/src/assets/images/hall/Elisa-chica-costado-izq.png
new file mode 100644
index 0000000..e99bf20
--- /dev/null
+++ b/src/assets/images/hall/Elisa-chica-costado-izq.png
diff --git a/src/assets/images/hall/Elisa-chica-costado-parada.png b/src/assets/images/hall/Elisa-chica-costado-parada.png
new file mode 100644
index 0000000..fb0c3e5
--- /dev/null
+++ b/src/assets/images/hall/Elisa-chica-costado-parada.png
diff --git a/src/game/BoyHall.py b/src/game/BoyHall.py
index 3850d23..cf4d130 100644
--- a/src/game/BoyHall.py
+++ b/src/game/BoyHall.py
@@ -27,8 +27,7 @@ class CBoyHall(CSprite):
     STATE_STALE = 0
     STATE_WALKING = 1
     STATE_TALKING = 2
-    
-    mFrameImage = []
+        
     
     # Canvas size: 299x600.
     
@@ -51,13 +50,20 @@ class CBoyHall(CSprite):
     
     mTimeState = 0
     
-    def __init__(self):
+    def __init__(self, aCharacter='Juan'):
         CSprite.__init__(self) 
-
-        self.STEP1 = Image.loadImage('assets/images/hall/Juan-chico-costado-izq.png')
-        self.STEP2 = Image.loadImage('assets/images/hall/Juan-chico-costado-parado.png')
-        self.STEP3 = Image.loadImage('assets/images/hall/Juan-chico-costado-der.png')
+        self.mCharacter = aCharacter
+        
+        if self.mCharacter == 'Juan':
+            self.STEP1 = Image.loadImage('assets/images/hall/Juan-chico-costado-izq.png')
+            self.STEP2 = Image.loadImage('assets/images/hall/Juan-chico-costado-parado.png')
+            self.STEP3 = Image.loadImage('assets/images/hall/Juan-chico-costado-der.png')
+        else:
+            self.STEP1 = Image.loadImage('assets/images/hall/Elisa-chica-costado-izq.png')
+            self.STEP2 = Image.loadImage('assets/images/hall/Elisa-chica-costado-parada.png')
+            self.STEP3 = Image.loadImage('assets/images/hall/Elisa-chica-costado-der.png')
         
+        self.mFrameImage = []
         self.mFrameImage.append(self.STEP1)
         self.mFrameImage.append(self.STEP2)
         self.mFrameImage.append(self.STEP3)
diff --git a/src/game/HallState.py b/src/game/HallState.py
index a856aea..833d8ce 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -76,8 +76,10 @@ class CHallState(CGameState):
         self.mImageRightArrow = pygame.transform.flip(self.mImageLeftArrow, True, False)
         self.mRightArrow.setImage(self.mImageRightArrow)
         CGame().addChild(self.mRightArrow)
-                
-        self.mPlayer = CBoyHall()
+        
+        character = CGame().getCharacter()
+        print 'get character of CGAME', character
+        self.mPlayer = CBoyHall(character)
         CGame().addChild(self.mPlayer)