Mercurial > skaapsteker

changeset 277:62b98bea56bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More level and scene change fixes.
author Jeremy Thurgood <firxen@gmail.com>
date Fri, 08 Apr 2011 19:27:51 +0200
parents 820bb9da2ef2
children abe77599ac47
files data/levels/fishmonger_house.json data/levels/theatre.json skaapsteker/cutscene.py
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/fishmonger_house.json	Fri Apr 08 19:24:39 2011 +0200
+++ b/data/levels/fishmonger_house.json	Fri Apr 08 19:27:51 2011 +0200
@@ -17,7 +17,7 @@
         "XXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
-        {"type": "RedOni", "pos": [5, 5], "direction": "left" },
+        {"type": "RedOni", "pos": [5, 5], "direction": "left" }
     ],
     "doorways": {
         "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "market.to_fishmonger_house"}
--- a/data/levels/theatre.json	Fri Apr 08 19:24:39 2011 +0200
+++ b/data/levels/theatre.json	Fri Apr 08 19:27:51 2011 +0200
@@ -20,6 +20,6 @@
         {"type": "RedOni", "pos": [5, 5], "direction": "left" }
     ],
     "doorways": {
-        "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "town.to_theatre"},
+        "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "town.to_theatre"}
     }
 }
\ No newline at end of file
--- a/skaapsteker/cutscene.py	Fri Apr 08 19:24:39 2011 +0200
+++ b/skaapsteker/cutscene.py	Fri Apr 08 19:27:51 2011 +0200
@@ -30,7 +30,7 @@
     def done(self, selected=None, data=None):
         # Avoid circular import...
         from .menuscene import MenuScene
-        ChangeScene.post(MenuScene(self.game_state))
+        ChangeScene.post((MenuScene,))
 
     def draw(self, surface, engine):
         viewport = surface.get_clip()