Changeset 222 for trunk/src/pyspacewar/ui.py

Timestamp:

12/25/06 16:21:01 (5 years ago)

Author:

mg

Message:

Allow players to access Help and Options during the game from the menu you
get by pressing Esc.

Files:

• trunk/src/pyspacewar/ui.py (modified) (10 diffs)

trunk/src/pyspacewar/ui.py

@@ -93 +93 @@
     a dual-monitor setup, the dual-head virtual mode (2048x768) appears as
     the largest video mode returned by list_modes.  However it does not work
-    at all as a full-screen mode, and looks weird when windowed..
+    at all as a full-screen mode, and looks weird when windowed.
     """
     return bool(w / h < 2)
@@ -911 +911 @@
     mouse_visible = False
 
+    inherit_pause_from_prev_mode = False
+
     def __init__(self, ui):
         self.ui = ui
@@ -926 +928 @@
             # Only do this once, otherwise two modes might get in a loop
             self.prev_mode = prev_mode
+            if self.inherit_pause_from_prev_mode and prev_mode is not None:
+                self.paused = prev_mode.paused
         pygame.mouse.set_visible(self.mouse_visible)
 
@@ -1059 +1063 @@
 
     mouse_visible = True
+    inherit_pause_from_prev_mode = True
 
     def init(self):
@@ -1153 +1158 @@
     """Mode: main menu."""
 
-    paused = False
-
     def init_menu(self):
         """Initialize the mode."""
@@ -1173 +1176 @@
     """Mode: new game menu."""
 
-    paused = False
-
     def init_menu(self):
         """Initialize the mode."""
@@ -1187 +1188 @@
 class OptionsMenuMode(MenuMode):
     """Mode: options menu."""
-
-    paused = False
 
     def init_menu(self):
@@ -1232 +1231 @@
     """Mode: screen resolution menu."""
 
-    paused = False
-
     def init_menu(self):
         """Initialize the mode."""
@@ -1254 +1251 @@
 
     paused = True
+    inherit_pause_from_prev_mode = False
 
     def init_menu(self):
@@ -1259 +1257 @@
         self.menu_items = [
             ('Resume game',     self.close_menu),
+            ('Options',         self.ui.options_menu),
+            ('Help',            self.ui.help),
             ('End Game',        self.ui.end_game),
         ]