Mercurial > fife-parpg
changeset 5:427bb0de3e29
small fixes to techdemo to enable usage of beach map. Still segfaults when enabled from settings.py
| author | jasoka@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Fri, 04 Jul 2008 19:02:53 +0000 |
| parents | 75d6b257af83 |
| children | 61fdc090b0d4 |
| files | clients/rio_de_hola/maps/beach.xml clients/rio_de_hola/maps/testmap3.xml clients/rio_de_hola/scripts/world.py |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/clients/rio_de_hola/maps/beach.xml Wed Jul 02 11:35:14 2008 +0000 +++ b/clients/rio_de_hola/maps/beach.xml Fri Jul 04 19:02:53 2008 +0000 @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="ascii"?> <map id="myMap" format="1.0"> <import dir="../objects/agents/beekeeper"></import> + <import dir="../objects/agents/boy"></import> + <import dir="../objects/agents/girl"></import> <import dir="../objects/clouds"></import> <import dir="../objects/ground"></import> <import dir="../objects/helpers"></import> @@ -1143,6 +1145,8 @@ <i x="6.0" o="rocks:03" z="0.0" y="-17.0" r="0"></i> <i x="6.0" o="rocks:02" z="0.0" y="-16.0" r="0"></i> <i x="7.0" o="rocks:01" z="0.0" y="-17.0" r="0"></i> + <i r="0" id="PC" z="0.0" x="5.0" o="boy" y="4.0"></i> + <i r="0" id="NPC:girl" z="0.0" x="8.0" o="girl" y="2.0"></i> </instances> </layer> <layer grid_type="square" id="TechdemoMapObjectLayer" x_scale="1.0" pathing="cell_edges_only" y_scale="1.0" rotation="0.0" x_offset="0.0" y_offset="0.0">
--- a/clients/rio_de_hola/maps/testmap3.xml Wed Jul 02 11:35:14 2008 +0000 +++ b/clients/rio_de_hola/maps/testmap3.xml Fri Jul 04 19:02:53 2008 +0000 @@ -394,7 +394,7 @@ <i x="4.0" o="beach:02" z="0.0" y="1.0" r="180"></i> </instances> </layer> - <layer grid_type="square" id="TechdemoMapObjectLayer" x_scale="1.0" pathing="cell_edges_only" y_scale="1.0" rotation="0.0" x_offset="0.0" y_offset="0.0"> + <layer grid_type="square" id="TechdemoMapGroundObjectLayer" x_scale="1.0" pathing="cell_edges_only" y_scale="1.0" rotation="0.0" x_offset="0.0" y_offset="0.0"> <instances> <i x="7.0" o="beekeeper" z="0.0" y="0.0" r="0"></i> <i r="0" id="PC" z="0.0" x="5.0" o="boy" y="4.0"></i>
--- a/clients/rio_de_hola/scripts/world.py Wed Jul 02 11:35:14 2008 +0000 +++ b/clients/rio_de_hola/scripts/world.py Fri Jul 04 19:02:53 2008 +0000 @@ -98,7 +98,7 @@ self.map = loadMapFile(filename, self.engine) self.maplistener = MapListener(self.map) - self.agentlayer = self.map.getLayer('TechdemoMapObjectLayer') + self.agentlayer = self.map.getLayer('TechdemoMapGroundObjectLayer') self.hero = Hero(self.model, 'PC', self.agentlayer) self.instance_to_agent[self.hero.agent.getFifeId()] = self.hero self.hero.start()