diff options
author | Alan Aguiar <alanjas@hotmail.com> | 2013-09-10 07:46:58 (GMT) |
---|---|---|
committer | Alan Aguiar <alanjas@hotmail.com> | 2013-09-10 07:46:58 (GMT) |
commit | 915a789f3a83f9227b3e2b8cda00daf111a1916f (patch) | |
tree | 4877ae19352b80b640f6fcdbc3e36f8a9600e20d /src/game | |
parent | 7782f647cdb5f9624724abaf337089b80b288311 (diff) |
from hall back to select area
Diffstat (limited to 'src/game')
-rw-r--r-- | src/game/HallState.py | 8 | ||||
-rw-r--r-- | src/game/SelectAreaState.py | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/game/HallState.py b/src/game/HallState.py index d1c14ba..2871e25 100644 --- a/src/game/HallState.py +++ b/src/game/HallState.py @@ -2,6 +2,8 @@ import pygame import MenuState +import SelectAreaState +# import CSelectAreaState from api.GameState import CGameState from api.Game import CGame from api.Button import CButton @@ -87,8 +89,10 @@ class CHallState(CGameState): if self.mButtonBack.clicked(): print "clicked back......" - ms = MenuState.CMenuState() - CGame().setState(ms) + #ms = MenuState.CMenuState() + cs = SelectAreaState.CSelectAreaState() + CGame().setState(cs) + cs.setPartida(self.mPartida) return elif self.mLeftArrow.clicked(): diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py index 9ae68dc..6b0c774 100644 --- a/src/game/SelectAreaState.py +++ b/src/game/SelectAreaState.py @@ -164,6 +164,7 @@ class CSelectAreaState(CGameState): CGame().removeChild(self.mArea3) CGame().removeChild(self.mLabelA3) self.mArea3Is = False + def setPartida(self, aPartida): self.mPartida = aPartida |