X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fmenu.py;h=9dc54c1ceb93a4d14dd81f11f0e81cb535c35b1b;hb=13d97e515402a19ce80af17eba94a6293ffbfcae;hp=e87005491f9fd79867b1fbc30b5c9242f298a08c;hpb=64b201d5de529398659af1022cabb985acd52ecc;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/menu.py b/tabakrolletjie/scenes/menu.py
index e870054..9dc54c1 100644
--- a/tabakrolletjie/scenes/menu.py
+++ b/tabakrolletjie/scenes/menu.py
@@ -13,15 +13,15 @@ class MenuScene(BaseScene):
     def enter(self, gamestate):
         if gamestate.station is None:
             print "Loading Station Alpha ..."
-            gamestate.load_station("station-alpha.json")
+            gamestate.set_station(loader.load_station("station-alpha.json"))
         font_title = loader.load_font(FONTS['bold'], size=32)
         self._title = font_title.render('A Game with a title', True,
                                         (255, 255, 255))
-        self._menu = {
-            'load level': TextButton("Load Level", (255, 255, 255)),
-            'saved game': TextButton("Load Saved Game", (255, 255, 255)),
-            'start game': TextButton("Start Game (Day)", (255, 255, 255)),
-        }
+        self._menu = [
+            TextButton("Load Level", (255, 255, 255), name='load level'),
+            TextButton("Start Game (Day)", (255, 255, 255), name='start game'),
+            TextButton("Load Saved Game", (255, 255, 255), name='load game'),
+        ]
 
     def render(self, surface, gamestate):
         surface.fill((0, 128, 0))
@@ -30,8 +30,7 @@ class MenuScene(BaseScene):
         surface.blit(self._title, pos, None)
 
         height = 150
-        for label in sorted(self._menu):
-            item = self._menu[label]
+        for item in self._menu:
             if not item.position:
                 item.position = ((surface.get_width() - item.get_width()) / 2,
                                  height)
@@ -39,15 +38,19 @@ class MenuScene(BaseScene):
             height += item.get_height() + 30
 
     def _get_pressed(self, ev):
-        for label, button in self._menu.items():
+        for button in self._menu:
             if button.pressed(ev):
-                return label
+                return button.name
         return None
 
     def _do_day(self):
         from .day import DayScene
         SceneChangeEvent.post(scene=DayScene())
 
+    def _do_load_level(self):
+        from .load_level import LoadLevelScene
+        SceneChangeEvent.post(scene=LoadLevelScene())
+
     def event(self, ev, gamestate):
         if ev.type == pgl.KEYDOWN:
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
@@ -58,13 +61,11 @@ class MenuScene(BaseScene):
             elif ev.key == pgl.K_d:
                 self._do_day()
             elif ev.key == pgl.K_l:
-                print "Loading Station Alpha ..."
-                gamestate.load_station("station-alpha.json")
+                self._do_load_level()
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             pressed = self._get_pressed(ev)
             if pressed == 'load level':
-                print "Loading Station Alpha ..."
-                gamestate.load_station("station-alpha.json")
+                self._do_load_level()
             elif pressed == 'start game':
                 self._do_day()
             elif pressed: