From 5863323d2fc4c752bb06ece5f042ec6c89ee859a Mon Sep 17 00:00:00 2001
From: Jason Long <jason@long.name>
Date: Sat, 20 Sep 2014 13:06:49 -0400
Subject: [PATCH] Animation format: convert to more xml-ish format

and make it consistent with the format used by tiles.idx
---
 graphics/fire.ani                       | 16 ++++++++--------
 graphics/fountain.ani                   |  8 ++++----
 graphics/nuclear-swirl.ani              |  8 ++++----
 graphics/radar.ani                      | 16 ++++++++--------
 graphics/stadium_animation.ani          | 16 ++++++++--------
 src/micropolisj/graphics/Animation.java | 10 +---------
 6 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/graphics/fire.ani b/graphics/fire.ani
index 38a75d2..e851bce 100644
--- a/graphics/fire.ani
+++ b/graphics/fire.ani
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <micropolis-animation>
-<frame>terrain@0,896</frame>
-<frame>terrain@0,912</frame>
-<frame>terrain@0,928</frame>
-<frame>terrain@0,944</frame>
-<frame>terrain@0,960</frame>
-<frame>terrain@0,976</frame>
-<frame>terrain@0,992</frame>
-<frame>terrain@0,1008</frame>
+<frame><image src="terrain" at="0,896"/></frame>
+<frame><image src="terrain" at="0,912"/></frame>
+<frame><image src="terrain" at="0,928"/></frame>
+<frame><image src="terrain" at="0,944"/></frame>
+<frame><image src="terrain" at="0,960"/></frame>
+<frame><image src="terrain" at="0,976"/></frame>
+<frame><image src="terrain" at="0,992"/></frame>
+<frame><image src="terrain" at="0,1008"/></frame>
 </micropolis-animation>
diff --git a/graphics/fountain.ani b/graphics/fountain.ani
index 3877351..03eb5d5 100644
--- a/graphics/fountain.ani
+++ b/graphics/fountain.ani
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <micropolis-animation>
-<frame>misc_animation@0,208</frame>
-<frame>misc_animation@0,224</frame>
-<frame>misc_animation@0,240</frame>
-<frame>misc_animation@0,256</frame>
+<frame><image src="misc_animation" at="0,208"/></frame>
+<frame><image src="misc_animation" at="0,224"/></frame>
+<frame><image src="misc_animation" at="0,240"/></frame>
+<frame><image src="misc_animation" at="0,256"/></frame>
 </micropolis-animation>
diff --git a/graphics/nuclear-swirl.ani b/graphics/nuclear-swirl.ani
index b605846..d2b5187 100644
--- a/graphics/nuclear-swirl.ani
+++ b/graphics/nuclear-swirl.ani
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <micropolis-animation>
-<frame>misc_animation@0,2000</frame>
-<frame>misc_animation@0,2016</frame>
-<frame>misc_animation@0,2032</frame>
-<frame>misc_animation@0,2048</frame>
+<frame><image src="misc_animation" at="0,2000"/></frame>
+<frame><image src="misc_animation" at="0,2016"/></frame>
+<frame><image src="misc_animation" at="0,2032"/></frame>
+<frame><image src="misc_animation" at="0,2048"/></frame>
 </micropolis-animation>
diff --git a/graphics/radar.ani b/graphics/radar.ani
index 802f364..c8ba6d2 100644
--- a/graphics/radar.ani
+++ b/graphics/radar.ani
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <micropolis-animation>
-<frame>misc_animation@0,80</frame>
-<frame>misc_animation@0,96</frame>
-<frame>misc_animation@0,112</frame>
-<frame>misc_animation@0,128</frame>
-<frame>misc_animation@0,144</frame>
-<frame>misc_animation@0,160</frame>
-<frame>misc_animation@0,176</frame>
-<frame>misc_animation@0,192</frame>
+<frame><image src="misc_animation" at="0,80"/></frame>
+<frame><image src="misc_animation" at="0,96"/></frame>
+<frame><image src="misc_animation" at="0,112"/></frame>
+<frame><image src="misc_animation" at="0,128"/></frame>
+<frame><image src="misc_animation" at="0,144"/></frame>
+<frame><image src="misc_animation" at="0,160"/></frame>
+<frame><image src="misc_animation" at="0,176"/></frame>
+<frame><image src="misc_animation" at="0,192"/></frame>
 </micropolis-animation>
diff --git a/graphics/stadium_animation.ani b/graphics/stadium_animation.ani
index b60f404..e8804a7 100644
--- a/graphics/stadium_animation.ani
+++ b/graphics/stadium_animation.ani
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <micropolis-animation>
-<frame>stadium_animation_gfx@0,0</frame>
-<frame>stadium_animation_gfx@16,0</frame>
-<frame>stadium_animation_gfx@32,0</frame>
-<frame>stadium_animation_gfx@48,0</frame>
-<frame>stadium_animation_gfx@64,0</frame>
-<frame>stadium_animation_gfx@80,0</frame>
-<frame>stadium_animation_gfx@96,0</frame>
-<frame>stadium_animation_gfx@112,0</frame>
+<frame><image src="stadium_animation_gfx" at="0,0"/></frame>
+<frame><image src="stadium_animation_gfx" at="16,0"/></frame>
+<frame><image src="stadium_animation_gfx" at="32,0"/></frame>
+<frame><image src="stadium_animation_gfx" at="48,0"/></frame>
+<frame><image src="stadium_animation_gfx" at="64,0"/></frame>
+<frame><image src="stadium_animation_gfx" at="80,0"/></frame>
+<frame><image src="stadium_animation_gfx" at="96,0"/></frame>
+<frame><image src="stadium_animation_gfx" at="112,0"/></frame>
 </micropolis-animation>
diff --git a/src/micropolisj/graphics/Animation.java b/src/micropolisj/graphics/Animation.java
index 818c038..e0a3ccc 100644
--- a/src/micropolisj/graphics/Animation.java
+++ b/src/micropolisj/graphics/Animation.java
@@ -71,15 +71,7 @@ public class Animation extends TileImage
 				String tmp = in.getAttributeValue(null, "duration");
 				int duration = tmp != null ? Integer.parseInt(tmp) : DEFAULT_DURATION;
 
-				String text = in.getElementText();
-				TileImage frameImage;
-				try {
-					frameImage = ctx.parseFrameSpec(text);
-				}
-				catch (IOException e) {
-					throw new XMLStreamException("Unable to load frame image: "+text, e);
-				}
-
+				TileImage frameImage = TileImage.readTileImageM(in, ctx);
 				addFrame( frameImage, duration );
 			}
 			else {