From 7c3d166b90cb683d450010266ff021660280bc64 Mon Sep 17 00:00:00 2001
From: Alan Aguiar <alanjas@hotmail.com>
Date: Tue, 01 Oct 2013 20:44:50 +0000
Subject: CGAme saves the current partida

---
diff --git a/src/api/Game.py b/src/api/Game.py
index 609311e..7bd8611 100644
--- a/src/api/Game.py
+++ b/src/api/Game.py
@@ -101,6 +101,7 @@ class CGame(object):
         self.mQuit = False
         
         self.mPartidaDict = getPartidasFromFile()
+        self.mCurrentPartida = 1
            
     def gameLoop(self):
         print "start game loop here"
@@ -164,6 +165,12 @@ class CGame(object):
             return self.mPartidaDict[n]
         else:
             return None
+    
+    def getCurrentPartida(self):
+        return self.mCurrentPartida
+    
+    def setCurrentPartida(self, n):
+        self.mCurrentPartida = n
         
     def setPartida(self, n, p):
         self.mPartidaDict[n] = p
diff --git a/src/game/SelectCharacterState.py b/src/game/SelectCharacterState.py
index 9c4b501..57bf457 100644
--- a/src/game/SelectCharacterState.py
+++ b/src/game/SelectCharacterState.py
@@ -20,8 +20,7 @@ class CSelectCharacterState(CGameState):
 
     def init(self):
         CGameState.__init__(self)
-        
-        self.mPartida = None
+
         
         self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
         CGame().setBackground(self.mBackground)
@@ -59,8 +58,6 @@ class CSelectCharacterState(CGameState):
         self.mMessage.set_text(unicode(mes, 'UTF-8'))
         CGame().addChild(self.mMessage)
         
-    def setPartida(self, aPartida):
-        self.mPartida = aPartida
        
     def update(self):
         #print "menu update"
@@ -68,18 +65,18 @@ class CSelectCharacterState(CGameState):
 
         if self.mJuan.clicked():
             print "clicked Juan"
-            CGame().setCharacter(self.mPartida, 'Juan')
+            par = CGame().getCurrentPartida()
+            CGame().setCharacter(par, 'Juan')
             ms = CSelectAreaState()
             CGame().setState(ms)
-            ms.setPartida(self.mPartida)
             return
         
         elif self.mElisa.clicked():
             print "clicked Elisa"
-            CGame().setCharacter(self.mPartida, 'Elisa')
+            par = CGame().getCurrentPartida()
+            CGame().setCharacter(par, 'Elisa')
             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 cfcdfb9..276e8a9 100644
--- a/src/game/SelectPartidaState.py
+++ b/src/game/SelectPartidaState.py
@@ -409,7 +409,8 @@ class CSelectPartidaState(CGameState):
                     else:
                         ch = CSelectAreaState()
                     CGame().setState(ch)
-                    ch.setPartida(1)
+                    CGame().setCurrentPartida(1)
+                    #ch.setPartida(1)
                     return
                     
                 elif self.mPartida2.clicked():
@@ -419,7 +420,8 @@ class CSelectPartidaState(CGameState):
                     else:
                         ch = CSelectAreaState()
                     CGame().setState(ch)
-                    ch.setPartida(2)
+                    CGame().setCurrentPartida(2)
+                    #ch.setPartida(2)
                     return
                 
                 elif self.mPartida3.clicked():
@@ -429,7 +431,8 @@ class CSelectPartidaState(CGameState):
                     else:
                         ch = CSelectAreaState()
                     CGame().setState(ch)
-                    ch.setPartida(3)
+                    CGame().setCurrentPartida(3)
+                    #ch.setPartida(3)
                     return
                 
             x = CMouse().getX()
--
cgit v0.9.1