From: Stephen Groundwater <slacker@gluebox.com>
Date: Mon, 3 Oct 2005 00:17:38 +0000 (+0000)
Subject: adjusting castle map to prepare for torch sprite
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=810ec54e234d6fdf6cec28aedc5c6cef242662df;p=supertux.git

adjusting castle map to prepare for torch sprite

SVN-Revision: 2802
---

diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index ac206b111..7009feebc 100644
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -658,7 +658,7 @@
 (tile (id 159)
      (images "worldmap/forest/fall7.png"))
 (tile (id 160)
-(anim-fps -15)
+(anim-fps 2)
      (images "worldmap/forest/fall8.png"
              "worldmap/forest/fall8b.png"
              "worldmap/forest/fall8c.png")
@@ -666,7 +666,7 @@
 (tile (id 161)
      (images "worldmap/forest/fall9.png"))
 (tile (id 162)
-(anim-fps -15)
+(anim-fps 2)
      (images "worldmap/forest/fall0.png"
              "worldmap/forest/fall0b.png"
              "worldmap/forest/fall0c.png"
@@ -1183,16 +1183,14 @@
     (solid #t))
 (tile
     (id 248)
-    (anim-fps 3)
-    (images "worldmap/forest/torch1.png"
-            "worldmap/forest/torch2.png"
-            "worldmap/forest/torch3.png")
-       
-    (stop #f)
-    (north #f)
-    (south #t)
-    (west  #f)
-    (east  #t))
+    (images
+      (region "worldmap/forest/castlemap.png" 96 192 32 32)
+ )         
+     (stop #f)
+     (north #f)
+     (south #t)
+     (west  #f)
+     (east  #t))
 (tile
     (id 249)
     (images
diff --git a/data/images/worldmap/forest/castlemap.png b/data/images/worldmap/forest/castlemap.png
index ada1465c2..94fefd83f 100644
Binary files a/data/images/worldmap/forest/castlemap.png and b/data/images/worldmap/forest/castlemap.png differ
diff --git a/data/images/worldmap/forest/torch1.png b/data/images/worldmap/forest/torch1.png
deleted file mode 100644
index 89c23fd2e..000000000
Binary files a/data/images/worldmap/forest/torch1.png and /dev/null differ
diff --git a/data/images/worldmap/forest/torch2.png b/data/images/worldmap/forest/torch2.png
deleted file mode 100644
index 53030568f..000000000
Binary files a/data/images/worldmap/forest/torch2.png and /dev/null differ
diff --git a/data/images/worldmap/forest/torch3.png b/data/images/worldmap/forest/torch3.png
deleted file mode 100644
index 9e1486b12..000000000
Binary files a/data/images/worldmap/forest/torch3.png and /dev/null differ