return to hall after each game

6 files changed, 28 insertions, 29 deletions

diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 8aa0402..6e48488 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -12,7 +12,7 @@ import api.Image as Image
 from api.Vector import CVector
 from api.Game import CGame
 from api.GameState import CGameState
-import MenuState
+import HallState
 
 from gettext import gettext as _
 
@@ -264,7 +264,6 @@ class CArea1Game1(CGameState):
         CGameState.update(self)
         
         if not(self.mAlphaSet):
-
             
             if self.mButtonBack.mouseOver():
                 if not(self.mBsetted):
@@ -281,9 +280,9 @@ class CArea1Game1(CGameState):
                 
             if self.mButtonBack.clicked():
                 #print "clicked clicked back of a1g1"
-                #cs = CHelpState()
-                ms = MenuState.CMenuState()
-                CGame().setState(ms)
+                hs = HallState.CHallState()
+                CGame().setState(hs)
+                hs.setCurrentGame(0)
                 return
         
             if (self.mGood == 8) or (self.mBad > 4):
@@ -296,8 +295,8 @@ class CArea1Game1(CGameState):
                 CGame().addChild(self.mButtonAccept)
         else:
             if self.mButtonAccept.clicked():
-                ms = MenuState.CMenuState()
-                CGame().setState(ms)
+                hs = HallState.CHallState()
+                CGame().setState(hs)
                 return
         
     def destroy(self):
diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py
index c79ecb8..f942fc0 100644
--- a/src/game/Area1Game3.py
+++ b/src/game/Area1Game3.py
@@ -2,7 +2,6 @@
 
 import pygame
 import random
-import MenuState
 import api.Image as Image
 from api.Game import CGame
 from api.GameState import CGameState
@@ -10,6 +9,7 @@ from api.Button import CButton
 from api.Sprite2 import CSprite
 from api.Points import CPoints
 from api.Globe import Globe
+import HallState
 from gettext import gettext as _
 
 from assets.data import area1game3_data
@@ -165,10 +165,10 @@ class CArea1Game3(CGameState):
                 self.mButtonBack.setImage(self.mBackImageN)
         
         if self.mButtonBack.clicked():
-            print "clicked back of a1g3"
-            #cs = CHelpState()
-            ms = MenuState.CMenuState()
-            CGame().setState(ms)
+            #print "clicked back of a1g3"
+            hs = HallState.CHallState()
+            CGame().setState(hs)
+            hs.setCurrentGame(2)
             return           
 
         if self.mCurrentState == 0:
diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index 10b8be3..ffbc634 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -2,7 +2,6 @@
 
 import pygame
 import random
-import MenuState
 import api.Image as Image
 from api.Game import CGame
 from api.GameState import CGameState
@@ -11,6 +10,7 @@ from api.Globe import Globe
 from api.Sprite2 import CSprite
 from api.MultiLabel import CMultiLabel
 from api.Points import CPoints
+import HallState
 from gettext import gettext as _
 
 from assets.data import area1game4_data
@@ -120,8 +120,9 @@ class CArea1Game4(CGameState):
                 self.mButtonBack.setImage(self.mBackImageN)
         
         if self.mButtonBack.clicked():
-            ms = MenuState.CMenuState()
-            CGame().setState(ms)
+            hs = HallState.CHallState()
+            CGame().setState(hs)
+            hs.setCurrentGame(3)
             return
         
         if self.mLocalState == STATE_ANSWER:
diff --git a/src/game/Area1Game5.py b/src/game/Area1Game5.py
index bb03acd..fc58fb3 100644
--- a/src/game/Area1Game5.py
+++ b/src/game/Area1Game5.py
@@ -2,7 +2,6 @@
 
 import pygame
 import random
-import MenuState
 import api.Image as Image
 from api.Game import CGame
 from api.GameState import CGameState
@@ -10,6 +9,7 @@ from api.Button import CButton
 from api.Sprite2 import CSprite
 from api.Points import CPoints
 from api.Globe import Globe
+import HallState
 from gettext import gettext as _
 
 from assets.data import area1game5_data
@@ -150,10 +150,10 @@ class CArea1Game5(CGameState):
                 self.mButtonBack.setImage(self.mBackImageN)
         
         if self.mButtonBack.clicked():
-            print "clicked back of a1g5"
-            #cs = CHelpState()
-            ms = MenuState.CMenuState()
-            CGame().setState(ms)
+            #print "clicked back of a1g5"
+            hs = HallState.CHallState()
+            CGame().setState(hs)
+            hs.setCurrentGame(4)
             return           
 
         if self.mCurrentState == 0:
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index fed75d1..a73a718 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -10,8 +10,7 @@ import api.Image as Image
 from api.Vector import CVector
 from api.Game import CGame
 from api.GameState import CGameState
-import MenuState
-
+import HallState
 
 from assets.data import area1game6_data
 
@@ -305,10 +304,10 @@ class CArea1Game6(CGameState):
                 self.mButtonBack.setImage(self.mBackImageN)
        
         if self.mButtonBack.clicked():
-            print "clicked clicked back of a1g6"
-            #cs = CHelpState()
-            ms = MenuState.CMenuState()
-            CGame().setState(ms)
+            #print "clicked clicked back of a1g6"
+            hs = HallState.CHallState()
+            CGame().setState(hs)
+            hs.setCurrentGame(5)
             return
         
         x = CMouse().getX()
diff --git a/src/game/Area2Game2.py b/src/game/Area2Game2.py
index 75286b4..1e64603 100644
--- a/src/game/Area2Game2.py
+++ b/src/game/Area2Game2.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import pygame
-import MenuState
 import api.Image as Image
 from api.Game import CGame
 from api.GameState import CGameState
@@ -9,6 +8,7 @@ from api.Button import CButton
 from api.Sprite2 import CSprite
 from api.MultiLabel import CMultiLabel
 from api.Points import CPoints
+import HallState
 from gettext import gettext as _
 
 from assets.data import area2game2_data
@@ -121,8 +121,8 @@ class CArea2Game2(CGameState):
                 self.mButtonBack.setImage(self.mBackImageN)
         
         if self.mButtonBack.clicked():
-            ms = MenuState.CMenuState()
-            CGame().setState(ms)
+            hs = HallState.CHallState()
+            CGame().setState(hs)
             return
         
         if self.mCurrentState == 0: