# HG changeset patch
# User jasoka@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1215198173 0
# Node ID 427bb0de3e2913a5147a59e9d4894ca3f61e2022
# Parent  75d6b257af8342f70d88242b1bf10faa72a0cf2e
small fixes to techdemo to enable usage of beach map. Still segfaults when enabled from settings.py

diff -r 75d6b257af83 -r 427bb0de3e29 clients/rio_de_hola/maps/beach.xml
--- 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">
diff -r 75d6b257af83 -r 427bb0de3e29 clients/rio_de_hola/maps/testmap3.xml
--- 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>
diff -r 75d6b257af83 -r 427bb0de3e29 clients/rio_de_hola/scripts/world.py
--- 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()