Mercurial > rinkhals

changeset 254:f399e4926c36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix events getting sent to the gameboard
author Neil Muller <drnlmuller@gmail.com>
date Sat, 05 Sep 2009 12:44:53 +0000
parents 9c5d2cb3f114
children c4f9e604c81e
files TODO gamelib/engine.py
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/TODO	Sat Sep 05 12:40:13 2009 +0000
+++ b/TODO	Sat Sep 05 12:44:53 2009 +0000
@@ -20,8 +20,7 @@
      -- Fox gibbing chicken (with feathers)
      -- Sapper foxes blowing things up?
 
-* <Nitwit> And we need to start testing for lose conditions, and set an upper time limit
-  -- Think about length of game (i.e. number of days)
+* Balance game (game length, profits & costs, etc.) 
 
 == POST PYWEEK ==
 
--- a/gamelib/engine.py	Sat Sep 05 12:40:13 2009 +0000
+++ b/gamelib/engine.py	Sat Sep 05 12:44:53 2009 +0000
@@ -17,6 +17,7 @@
         self.main_menu = mainmenu.make_main_menu()
         self._open_window = None
         self.scoreboard = gameover.ScoreTable()
+        self.gameboard = None
 
     def tick(self):
         """Tic toc."""
@@ -46,8 +47,14 @@
     def create_game_over(self):
         """Create and open the Game Over window"""
         game_over = gameover.create_game_over(self.gameboard, self.scoreboard)
+        self.gameboard = None
         self.open_window(game_over)
 
+    def event(self, e):
+        if not Game.event(self, e) and self.gameboard:
+            self.gameboard.event(e)
+        
+
 class MainMenuState(State):
     def init(self):
         sound.stop_background_music()