From: Arvid Norlander <anmaster@berlios.de>
Date: Sat, 3 Feb 2007 18:45:23 +0000 (+0000)
Subject: Merged nolok statue images.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=976cb6eef3bba1452127fd126b03f2eb4f395f0d;p=supertux.git

Merged nolok statue images.

SVN-Revision: 4787
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 3fde936ea..95df10ee8 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -1368,16 +1368,18 @@
     (goal #t)
     (editor-images "tiles/auxiliary/endseq.png")
   )
+  ; For compatibility with 0.1.x levels, use tile to 1809-1814 instead
   (tile
     (id 134)
     (images
-      "tiles/doodads/nolok1.png"
+      (region "tiles/doodads/nolok-statue.png" 0 0 32 96)
     )
   )
+  ; For compatibility with 0.1.x levels, use tile to 1809-1814 instead
   (tile
     (id 135)
     (images
-      "tiles/doodads/nolok2.png"
+      (region "tiles/doodads/nolok-statue.png" 32 0 32 96)
     )
   )
 
@@ -6371,36 +6373,21 @@
     (image "tiles/castle/brown.png")
   )
 
-;Statue of Nolok, Tile ID 1809-1814
+  ;Statue of Nolok, Tile ID 1809-1814
   (tiles
-    (width 1)
-    (height 3)
-    (ids
-      1809
-      1810
-      1811
-    )
-    (attributes
-      0
-      0
-      0
-    )
-    (image "tiles/doodads/nolok1.png")
-  )
-  (tiles
-    (width 1)
+    (width 2)
     (height 3)
     (ids
-      1812
-      1813
-      1814
+      1809 1812
+      1810 1813
+      1811 1814
     )
     (attributes
-      0
-      0
-      0
+      0 0
+      0 0
+      0 0
     )
-    (image "tiles/doodads/nolok2.png")
+    (image "tiles/doodads/nolok-statue.png")
   )
   (tiles
     (width 2)
diff --git a/data/images/tiles/doodads/nolok-statue.png b/data/images/tiles/doodads/nolok-statue.png
new file mode 100644
index 000000000..e6d7fbda3
Binary files /dev/null and b/data/images/tiles/doodads/nolok-statue.png differ
diff --git a/data/images/tiles/doodads/nolok1.png b/data/images/tiles/doodads/nolok1.png
deleted file mode 100644
index 8bf950d6d..000000000
Binary files a/data/images/tiles/doodads/nolok1.png and /dev/null differ
diff --git a/data/images/tiles/doodads/nolok2.png b/data/images/tiles/doodads/nolok2.png
deleted file mode 100644
index ebb2d4f48..000000000
Binary files a/data/images/tiles/doodads/nolok2.png and /dev/null differ