[Pingus-CVS] r2454 - trunk/data/data

[David Philippi at BerliOS]

Author: torangan
Date: 2005-10-05 13:59:11 +0200 (Wed, 05 Oct 2005)
New Revision: 2454

Modified:
   trunk/data/data/core.xml
   trunk/data/data/liquids.xml
Log:
applied patch from Tomas Blaha

Modified: trunk/data/data/core.xml
===================================================================
--- trunk/data/data/core.xml    2005-10-05 11:32:03 UTC (rev 2453)
+++ trunk/data/data/core.xml    2005-10-05 11:59:11 UTC (rev 2454)
@@ -123,8 +123,9 @@
       </sprite>
 
       <sprite name="armageddon_anim">
-        <image file="../images/core/buttons/armageddon_anim.png"/>
-        <grid array="14,1" size="36,57" pos="0,0"/>
+        <image file="../images/core/buttons/armageddon_anim.png">
+          <grid array="14,1" size="36,57" pos="0,0"/>
+       </image>
       </sprite>
     </section>
     <section name="menu">

Modified: trunk/data/data/liquids.xml
===================================================================
--- trunk/data/data/liquids.xml 2005-10-05 11:32:03 UTC (rev 2453)
+++ trunk/data/data/liquids.xml 2005-10-05 11:59:11 UTC (rev 2454)
@@ -13,7 +13,7 @@
       <animation speed="130" />
       <image file="../images/liquids/water2.png">
         <grid pos="0,0" size="64,64" array="8,1"/>
-      </image>-->
+      </image>
     </sprite>
     <sprite name="water3">
       <image file="../images/liquids/water3.png">