changeset 44:ac14e127bb9f

Fix closing the window
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sat, 31 Aug 2013 15:00:07 +0200
parents b762c6d4d455
children 7feac4ad743f
files jelly/game.py jelly/jelly.png jelly/message.py
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/jelly/game.py	Sat Aug 31 14:24:24 2013 +0200
+++ b/jelly/game.py	Sat Aug 31 15:00:07 2013 +0200
@@ -43,6 +43,7 @@
                 except util.QuitLevel:
                     pass
         except util.QuitGame:
+            pygame.quit()
             return
 
     def game_menu(self):
@@ -51,9 +52,9 @@
         choice = None
         try:
             while choice is None:
-                self.clock.tick(15)
                 self.display.update()
                 self.display.draw()
+                self.clock.tick(15)
                 choice = menu.update()
         except util.QuitLevel:
             raise util.QuitGame()
Binary file jelly/jelly.png has changed
--- a/jelly/message.py	Sat Aug 31 14:24:24 2013 +0200
+++ b/jelly/message.py	Sat Aug 31 15:00:07 2013 +0200
@@ -127,10 +127,10 @@
     def move(self, di):
         self.cursor.item = max(0, min(len(self.items)-1, self.cursor.item + di))
 
-    def cleanup(self):
+    def cleanup(self, wait=True):
         for sprite in self.sprites:
             sprite.kill()
-        while True:
+        while wait:
             if pygame.event.wait().type == pg.KEYUP:
                 return
 
@@ -148,7 +148,7 @@
                 self.cleanup()
                 return False
             elif event.type == pg.QUIT:
-                self.cleanup()
+                self.cleanup(False)
                 raise util.QuitGame()
             elif event.type == pg.KEYDOWN and event.key == pg.K_ESCAPE:
                 self.cleanup()