Mercurial > pyntnclick

changeset 453:ab628938b95c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move background setting. Set end_game flag
author Neil Muller <neil@dip.sun.ac.za>
date Sun, 29 Aug 2010 01:02:34 +0200
parents fdf3a6dd476b
children 25d05248bdf2
files gamelib/scenes/bridge.py
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/scenes/bridge.py	Sun Aug 29 00:58:14 2010 +0200
+++ b/gamelib/scenes/bridge.py	Sun Aug 29 01:02:34 2010 +0200
@@ -385,6 +385,7 @@
 
     def interact_without(self):
         self.state.detail_views[self.COMPUTER].set_data('tab', 'log')
+        self.state.detail_views[self.COMPUTER].set_background()
         return Result(soundfile='beep550.ogg')
 
 
@@ -404,6 +405,7 @@
 
     def interact_without(self):
         self.state.detail_views[self.COMPUTER].set_data('tab', 'alert')
+        self.state.detail_views[self.COMPUTER].set_background()
         return Result(soundfile='beep550.ogg')
 
 class NavTab(Thing):
@@ -422,6 +424,7 @@
 
     def interact_without(self):
         self.state.detail_views[self.COMPUTER].set_data('tab', 'nav')
+        self.state.detail_views[self.COMPUTER].set_background()
         return Result(soundfile='beep550.ogg')
 
 class DestNavPageLine(Thing):
@@ -454,7 +457,7 @@
             return Result("You could change the destination, but when JIM recovers, it'll just get reset.")
         if self.state.scenes['bridge'].get_data('ai status') == 'dead':
             self.state.set_current_scene('won')
-            return Result("You change the destination.", soundfile="beep550.ogg", close_detail=True)
+            return Result("You change the destination.", soundfile="beep550.ogg", end_game=True)
 
 class CompUpButton(Thing):
     """Up button on log screen"""
@@ -475,6 +478,7 @@
     def interact_without(self):
         page = self.state.detail_views[self.COMPUTER].get_data('log page')
         self.state.detail_views[self.COMPUTER].set_data('log page', page-1)
+        self.state.detail_views[self.COMPUTER].set_background()
         return Result(soundfile='beep550.ogg')
 
 
@@ -498,6 +502,7 @@
     def interact_without(self):
         page = self.state.detail_views[self.COMPUTER].get_data('log page')
         self.state.detail_views[self.COMPUTER].set_data('log page', page+1)
+        self.state.detail_views[self.COMPUTER].set_background()
         return Result(soundfile='beep550.ogg')
 
 
@@ -576,11 +581,12 @@
     def enter(self):
         self._scene_playlist = get_current_playlist()
         change_playlist(None)
+        self.set_background()
 
     def leave(self):
         change_playlist(self._scene_playlist)
 
-    def draw_background(self, surface):
+    def set_background(self):
         if self.get_data('tab') == 'alert':
             self._clear_navigation()
             self._background = self._alert
@@ -589,7 +595,6 @@
             self._background = self._logs[self.get_data('log page')]
         elif self.get_data('tab') == 'nav':
             self._background = self._get_nav_page()
-        super(BridgeCompDetail, self).draw_background(surface)
 
     def _clear_navigation(self):
         "Remove navigation things if necessary"