# HG changeset patch
# User vtchill@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1235522147 0
# Node ID 32cc4bda190c6bf8a0d7fc6c138252071e792919
# Parent  fcef34d67ad9b1519e52efb548c2174dff89d52b
fixes problems with name clashes which cause the engine to throw NameClash exceptions

diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/balls/blue/object.xml
--- a/clients/rio_de_hola/objects/items/resort/balls/blue/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/balls/blue/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,5 +1,5 @@
 <?fife type="object"?>
-<object id="blue" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="blue_ball" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 	<image source="045.png" direction="45" />
 	<image source="090.png" direction="90" />
diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/balls/green/object.xml
--- a/clients/rio_de_hola/objects/items/resort/balls/green/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/balls/green/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,5 +1,5 @@
 <?fife type="object"?>
-<object id="green" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="green_ball" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 	<image source="045.png" direction="45" />
 	<image source="090.png" direction="90" />
diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/balls/red/object.xml
--- a/clients/rio_de_hola/objects/items/resort/balls/red/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/balls/red/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,5 +1,5 @@
 <?fife type="object"?>
-<object id="red" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="red_ball" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 	<image source="045.png" direction="45" />
 	<image source="090.png" direction="90" />
diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/life_belts/blue/object.xml
--- a/clients/rio_de_hola/objects/items/resort/life_belts/blue/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/life_belts/blue/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,5 +1,5 @@
 <?fife type="object"?>
-<object id="blue" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="blue_belt" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 	<image source="045.png" direction="45" />
 	<image source="090.png" direction="90" />
diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/life_belts/green/object.xml
--- a/clients/rio_de_hola/objects/items/resort/life_belts/green/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/life_belts/green/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,5 +1,5 @@
 <?fife type="object"?>
-<object id="green" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="green_belt" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 	<image source="045.png" direction="45" />
 	<image source="090.png" direction="90" />
diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/life_belts/red/object.xml
--- a/clients/rio_de_hola/objects/items/resort/life_belts/red/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/life_belts/red/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,5 +1,5 @@
 <?fife type="object"?>
-<object id="red" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="red_belt" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 	<image source="045.png" direction="45" />
 	<image source="090.png" direction="90" />
diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/sunshades/blue/object.xml
--- a/clients/rio_de_hola/objects/items/resort/sunshades/blue/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/sunshades/blue/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,4 +1,4 @@
 <?fife type="object"?>
-<object id="blue" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="blue_sunshade" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 </object>
diff -r fcef34d67ad9 -r 32cc4bda190c clients/rio_de_hola/objects/items/resort/sunshades/red/object.xml
--- a/clients/rio_de_hola/objects/items/resort/sunshades/red/object.xml	Thu Feb 19 06:24:58 2009 +0000
+++ b/clients/rio_de_hola/objects/items/resort/sunshades/red/object.xml	Wed Feb 25 00:35:47 2009 +0000
@@ -1,4 +1,4 @@
 <?fife type="object"?>
-<object id="red" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
+<object id="red_sunshade" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1">
 	<image source="000.png" direction="0" />
 </object>