X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fscenes%2Fmenu.py;h=327bb0b371f6222883d9370d68f4e469170fec4a;hb=75d1f94ef500df4bea81d8988757d37221a310dd;hp=3a7896908347cb037ecb26ef95717b269e32662e;hpb=266021313a1501c86c11c803851c2b4bb50a8c00;p=naja.git

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index 3a78969..327bb0b 100644
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -4,14 +4,15 @@ Main menu scene.
 
 import pygame.locals as pgl
 
-from naja.constants import KEYS
+from naja.constants import KEYS, PALETTE
+from naja.events import SceneChangeEvent, QuitGameEvent
 from naja.scenes.scene import Scene
-from naja.widgets.text import TextWidget
-from naja.widgets.selector import SelectorWidget
-from naja.events import QuitGameEvent
 from naja.scenes.credits import CreditsScene
 from naja.scenes.game import GameScene
-from naja.events import SceneChangeEvent
+from naja.scenes.load_save import LoadGameScene, SaveGameScene
+from naja.scenes.new_game import NewGameScene
+from naja.widgets.selector import SelectorWidget
+from naja.widgets.text import TextWidget
 
 
 class MenuScene(Scene):
@@ -19,19 +20,47 @@ class MenuScene(Scene):
         super(MenuScene, self).__init__(state)
         selector = SelectorWidget()
         self.add(selector)
-        run_game = TextWidget((100, 100), 'Game', fontsize=32, colour='white')
-        run_game.add_callback('click',
-                              lambda event: SceneChangeEvent.post(GameScene))
-        selector.add(run_game)
-        credits = TextWidget(
-            (100, 200), 'Credits', fontsize=32, colour='white')
-        credits.add_callback('click',
-                             lambda event: SceneChangeEvent.post(CreditsScene))
+        y_offset = 0
+
+        y_offset += 50
+        resume = TextWidget(
+            (100, y_offset), 'Resume Game', colour=PALETTE.WHITE,
+            unselectable_colour=PALETTE.GREY)
+        resume.add_callback('click', self.scene_callback(GameScene))
+        resume.set_selectable_callback(lambda: state is not None)
+        selector.add(resume)
+
+        y_offset += 50
+        new = TextWidget((100, y_offset), 'New Game', colour=PALETTE.WHITE)
+        new.add_callback('click', self.scene_callback(NewGameScene))
+        selector.add(new)
+
+        y_offset += 50
+        load = TextWidget((100, y_offset), 'Load', colour=PALETTE.WHITE)
+        load.add_callback('click', self.scene_callback(LoadGameScene))
+        selector.add(load)
+
+        y_offset += 50
+        save = TextWidget(
+            (100, y_offset), 'Save', colour=PALETTE.WHITE,
+            unselectable_colour=PALETTE.GREY)
+        save.add_callback('click', self.scene_callback(SaveGameScene))
+        save.set_selectable_callback(lambda: state is not None)
+        selector.add(save)
+
+        y_offset += 50
+        credits = TextWidget((100, y_offset), 'Credits', colour=PALETTE.WHITE)
+        credits.add_callback('click', self.scene_callback(CreditsScene))
         selector.add(credits)
-        quit = TextWidget((100, 300), 'Quit', fontsize=32, colour='white')
+
+        y_offset += 50
+        quit = TextWidget((100, y_offset), 'Quit', colour=PALETTE.WHITE)
         quit.add_callback('click', lambda event: QuitGameEvent.post())
         selector.add(quit)
 
+    def scene_callback(self, scene_class):
+        return lambda event: SceneChangeEvent.post(scene_class)
+
     def handle_scene_event(self, ev):
         if ev.type == pgl.KEYDOWN:
             if ev.key in KEYS.QUIT: