Mercurial > fife-parpg

changeset 184:32cc4bda190c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes problems with name clashes which cause the engine to throw NameClash exceptions
author vtchill@33b003aa-7bff-0310-803a-e67f0ece8222
date Wed, 25 Feb 2009 00:35:47 +0000
parents fcef34d67ad9
children 70724fd111b8
files clients/rio_de_hola/objects/items/resort/balls/blue/object.xml clients/rio_de_hola/objects/items/resort/balls/green/object.xml clients/rio_de_hola/objects/items/resort/balls/red/object.xml clients/rio_de_hola/objects/items/resort/life_belts/blue/object.xml clients/rio_de_hola/objects/items/resort/life_belts/green/object.xml clients/rio_de_hola/objects/items/resort/life_belts/red/object.xml clients/rio_de_hola/objects/items/resort/sunshades/blue/object.xml clients/rio_de_hola/objects/items/resort/sunshades/red/object.xml
diffstat 8 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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>
--- 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>