the character on hall depends of partida

4 files changed, 34 insertions, 28 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index 779fc6d..2ba9c08 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -39,6 +39,8 @@ class CHallState(CGameState):
         #CGame().addChild(self.mInstructions)
         #print self.mX
         
+        self.mPartida = None
+        
         self.mCurrentSelectedArea = 0
         
         self.mButtonBack = CButton()
@@ -83,13 +85,7 @@ class CHallState(CGameState):
         self.mImageRightArrow = pygame.transform.flip(self.mImageLeftArrow, True, False)
         self.mRightArrow.setImage(self.mImageRightArrow)
         CGame().addChild(self.mRightArrow)
-        
-        #TODO: fix el 1 d'accord partida
-        character = CGame().getCharacter(1)
-        print 'get character of CGAME', character
-        self.mPlayer = CBoyHall(character)
-        CGame().addChild(self.mPlayer)
-        
+
         
     def update(self):
         #print "menu update"
@@ -145,6 +141,13 @@ class CHallState(CGameState):
                 CGame().removeChild(self.mDoor)
                 self.mDoorIs = False
 
+    def setPartida(self, aPartida):
+        self.mPartida = aPartida
+        #TODO: remove from here?
+        character = CGame().getCharacter(self.mPartida)
+        print 'get character of CGAME', character, self.mPartida
+        self.mPlayer = CBoyHall(character)
+        CGame().addChild(self.mPlayer)
         
     def destroy(self):
         #CGame().removeChild(self.mText)
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index fd8eb5e..e711bb5 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -40,6 +40,8 @@ class CSelectAreaState(CGameState):
     def init(self):
         CGameState.init(self)
         
+        self.mPartida = None
+        
         self.mButtonBack = CButton()
         self.mButtonBack.set_bgColor((0x99, 0x99, 0x66))
         self.mButtonBack.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
@@ -122,6 +124,8 @@ class CSelectAreaState(CGameState):
             if (CMouse().release()):
                 hs = CHallState()
                 CGame().setState(hs)
+                hs.setPartida(self.mPartida)
+                return
         else:
             if self.mArea1Is:
                 CGame().removeChild(self.mArea1)
@@ -136,7 +140,7 @@ class CSelectAreaState(CGameState):
             if (CMouse().release()):
                 #hs = CHallState()
                 #CGame().setState(hs)
-                pass
+                return
         else:
             if self.mArea2Is:
                 CGame().removeChild(self.mArea2)
@@ -151,13 +155,14 @@ class CSelectAreaState(CGameState):
             if (CMouse().release()):
                 #hs = CHallState()
                 #CGame().setState(hs)
-                pass
+                return
         else:
             if self.mArea3Is:
                 CGame().removeChild(self.mArea3)
                 CGame().removeChild(self.mLabelA3)
                 self.mArea3Is = False
-
+    def setPartida(self, aPartida):
+        self.mPartida = aPartida
 
     def destroy(self):
         print 'A1G1 destroy'
diff --git a/src/game/SelectCharacterState.py b/src/game/SelectCharacterState.py
index 1aa2f74..be3ae02 100644
--- a/src/game/SelectCharacterState.py
+++ b/src/game/SelectCharacterState.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import pygame
-import MenuState
+
 from api.GameState import CGameState
 from api.Label import CLabel
 from api.Game import CGame
 from api.Sprite2 import CSprite
 
+from SelectAreaState import CSelectAreaState
+
 import api.Image as Image
 
 from gettext import gettext as _
@@ -69,15 +71,17 @@ class CSelectCharacterState(CGameState):
         if self.mJuan.clicked():
             print "clicked Juan"
             CGame().setCharacter(self.mPartida, 'Juan')
-            ms = MenuState.CMenuState()
+            ms = CSelectAreaState()
             CGame().setState(ms)
+            ms.setPartida(self.mPartida)
             return
         
         elif self.mElisa.clicked():
             print "clicked Elisa"
             CGame().setCharacter(self.mPartida, 'Elisa')
-            ms = MenuState.CMenuState()
+            ms = CSelectAreaState()
             CGame().setState(ms)
+            ms.setPartida(self.mPartida)
             return
         
         if self.mJuan.mouseOver():
diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py
index 2663f6a..15283b1 100644
--- a/src/game/SelectPartidaState.py
+++ b/src/game/SelectPartidaState.py
@@ -183,33 +183,30 @@ class CSelectPartidaState(CGameState):
             print "partida 1"
             if self.misEmptyP1:
                 ch = CSelectCharacterState()
-                CGame().setState(ch)
-                ch.setPartida(1)
             else:
-                csa = CSelectAreaState()
-                CGame().setState(csa)
+                ch = CSelectAreaState()
+            CGame().setState(ch)
+            ch.setPartida(1)
             return
             
         elif self.mPartida2.clicked():
             print "partida 2"
             if self.misEmptyP2:
                 ch = CSelectCharacterState()
-                CGame().setState(ch)
-                ch.setPartida(2)
             else:
-                csa = CSelectAreaState()
-                CGame().setState(csa)
+                ch = CSelectAreaState()
+            CGame().setState(ch)
+            ch.setPartida(2)
             return
         
         elif self.mPartida3.clicked():
             print "partida 3"
             if self.misEmptyP3:
                 ch = CSelectCharacterState()
-                CGame().setState(ch)
-                ch.setPartida(3)
             else:
-                csa = CSelectAreaState()
-                CGame().setState(csa)
+                ch = CSelectAreaState()
+            CGame().setState(ch)
+            ch.setPartida(3)
             return
         
         if self.mPartida1.mouseOver():
@@ -245,9 +242,6 @@ class CSelectPartidaState(CGameState):
                 CGame().removeChild(self.mBorderPartida3)
                 return
             
-    def getPartidaState(self, number):
-        return None
-
     def destroy(self):
         CGameState.destroy(self)