# HG changeset patch # User Jeremy Thurgood # Date 1302283671 -7200 # Node ID 62b98bea56bfdfc586dc4976fd799df5eb4935e3 # Parent 820bb9da2ef2a5103dff824f259c6f4199f6c9f1 More level and scene change fixes. diff -r 820bb9da2ef2 -r 62b98bea56bf data/levels/fishmonger_house.json --- 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"} diff -r 820bb9da2ef2 -r 62b98bea56bf data/levels/theatre.json --- 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 diff -r 820bb9da2ef2 -r 62b98bea56bf skaapsteker/cutscene.py --- 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()