# HG changeset patch
# User Simon Cross <hodgestar@gmail.com>
# Date 1302290580 -7200
# Node ID ddcfc159dc2af4a38f85956702417ed85c50c318
# Parent  f512e874b2e79444a05e1c014960b1256fa92aa2
Combine 'fox' and 'player' sections in game.json.

diff -r f512e874b2e7 -r ddcfc159dc2a data/game.json
--- a/data/game.json	Fri Apr 08 21:17:30 2011 +0200
+++ b/data/game.json	Fri Apr 08 21:23:00 2011 +0200
@@ -3,7 +3,9 @@
         "item": null,
         "tails" : [],
         "cur_health" : 40,
-        "max_health" : 40
+        "max_health" : 40,
+        "level": "temple",
+        "doorway": "starting"
     },
     "missions": {
         "monk_tea": false,
@@ -40,6 +42,5 @@
         "temple" : "temple",
         "theatre" : "theatre",
         "town" : "town"
-    },
-    "player": {"level": "temple", "doorway": "starting"}
+    }
 }
diff -r f512e874b2e7 -r ddcfc159dc2a skaapsteker/levelscene.py
--- a/skaapsteker/levelscene.py	Fri Apr 08 21:17:30 2011 +0200
+++ b/skaapsteker/levelscene.py	Fri Apr 08 21:23:00 2011 +0200
@@ -22,9 +22,9 @@
         super(LevelScene, self).__init__(game_state, soundsystem)
 
         if doorway_def is not None:
-            player_def = self.game_state.world.player
-            player_def.level, player_def.doorway = doorway_def.split('.')
-        self._level = level.Level(self.game_state.world.player.level, soundsystem)
+            fox = self.game_state.world.fox
+            fox.level, fox.doorway = doorway_def.split('.')
+        self._level = level.Level(self.game_state.world.fox.level, soundsystem)
         self._player_dead = False
         self._dialogue = None
 
@@ -45,7 +45,7 @@
         self._key_sequence = []
 
     def setup_player(self):
-        doorway = self._level.doorways[self.game_state.world.player.doorway]
+        doorway = self._level.doorways[self.game_state.world.fox.doorway]
         self._player = player.Player(self.game_state.world, self._soundsystem)
         self._player.set_facing(doorway.facing)
         self._player.set_image()