Merged Spiky and Sleeping Spiky to reduce number of duplicated images

SVN-Revision: 3343

diff --git a/data/images/creatures/spiky/sleeping-left.png b/data/images/creatures/spiky/sleeping-left.png
new file mode 100644 (file)
index 0000000..45a847b
Binary files /dev/null and b/data/images/creatures/spiky/sleeping-left.png differ

diff --git a/data/images/creatures/spiky/sleepingspiky.sprite b/data/images/creatures/spiky/sleepingspiky.sprite
new file mode 100644 (file)
index 0000000..159a0a1
--- /dev/null
+++ b/data/images/creatures/spiky/sleepingspiky.sprite
@@ -0,0 +1,49 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (x-offset 6)
+  (y-offset 10)
+  (images "left-0.png"
+   "left-1.png"
+   "left-2.png"))
+ (action
+  (name "right")
+  (x-offset 6)
+  (y-offset 10)
+  (mirror-action "left"))
+ (action
+  (name "iced-left")
+  (x-offset 6)
+  (y-offset 10)
+  (images "iced-left.png"))
+ (action
+  (name "iced-right")
+  (x-offset 6)
+  (y-offset 10)
+  (mirror-action "iced-left")
+ )
+ (action
+  (name "sleeping-left")
+  (x-offset 6)
+  (y-offset 10)
+  (images "sleeping-left.png"))
+ (action
+  (name "sleeping-right")
+  (x-offset 6)
+  (y-offset 10)
+  (mirror-action "sleeping-left"))
+ (action
+  (name "waking-left")
+  (x-offset 6)
+  (y-offset 10)
+  (fps 6.0)
+  (images "waking-left-0.png"
+   "waking-left-1.png"
+   "waking-left-2.png"))
+ (action
+  (name "waking-right")
+  (fps 6.0)
+  (x-offset 6)
+  (y-offset 10)
+  (mirror-action "waking-left"))
+)

diff --git a/data/images/creatures/spiky/waking-left-0.png b/data/images/creatures/spiky/waking-left-0.png
new file mode 100644 (file)
index 0000000..0509325
Binary files /dev/null and b/data/images/creatures/spiky/waking-left-0.png differ

diff --git a/data/images/creatures/spiky/waking-left-1.png b/data/images/creatures/spiky/waking-left-1.png
new file mode 100644 (file)
index 0000000..28cb484
Binary files /dev/null and b/data/images/creatures/spiky/waking-left-1.png differ

diff --git a/data/images/creatures/spiky/waking-left-2.png b/data/images/creatures/spiky/waking-left-2.png
new file mode 100644 (file)
index 0000000..2ca33ab
Binary files /dev/null and b/data/images/creatures/spiky/waking-left-2.png differ

diff --git a/data/images/creatures/sspiky/iced-left.png b/data/images/creatures/sspiky/iced-left.png
deleted file mode 100644 (file)
index 92f6c51..0000000
Binary files a/data/images/creatures/sspiky/iced-left.png and /dev/null differ

diff --git a/data/images/creatures/sspiky/left-0.png b/data/images/creatures/sspiky/left-0.png
deleted file mode 100644 (file)
index 6715371..0000000
Binary files a/data/images/creatures/sspiky/left-0.png and /dev/null differ

diff --git a/data/images/creatures/sspiky/left-1.png b/data/images/creatures/sspiky/left-1.png
deleted file mode 100644 (file)
index 2ca33ab..0000000
Binary files a/data/images/creatures/sspiky/left-1.png and /dev/null differ

diff --git a/data/images/creatures/sspiky/left-2.png b/data/images/creatures/sspiky/left-2.png
deleted file mode 100644 (file)
index eb845fb..0000000
Binary files a/data/images/creatures/sspiky/left-2.png and /dev/null differ

diff --git a/data/images/creatures/sspiky/sleeping-left.png b/data/images/creatures/sspiky/sleeping-left.png
deleted file mode 100644 (file)
index 45a847b..0000000
Binary files a/data/images/creatures/sspiky/sleeping-left.png and /dev/null differ

diff --git a/data/images/creatures/sspiky/sspiky.sprite b/data/images/creatures/sspiky/sspiky.sprite
deleted file mode 100644 (file)
index 159a0a1..0000000
--- a/data/images/creatures/sspiky/sspiky.sprite
+++ /dev/null
@@ -1,49 +0,0 @@
-(supertux-sprite
- (action
-  (name "left")
-  (x-offset 6)
-  (y-offset 10)
-  (images "left-0.png"
-   "left-1.png"
-   "left-2.png"))
- (action
-  (name "right")
-  (x-offset 6)
-  (y-offset 10)
-  (mirror-action "left"))
- (action
-  (name "iced-left")
-  (x-offset 6)
-  (y-offset 10)
-  (images "iced-left.png"))
- (action
-  (name "iced-right")
-  (x-offset 6)
-  (y-offset 10)
-  (mirror-action "iced-left")
- )
- (action
-  (name "sleeping-left")
-  (x-offset 6)
-  (y-offset 10)
-  (images "sleeping-left.png"))
- (action
-  (name "sleeping-right")
-  (x-offset 6)
-  (y-offset 10)
-  (mirror-action "sleeping-left"))
- (action
-  (name "waking-left")
-  (x-offset 6)
-  (y-offset 10)
-  (fps 6.0)
-  (images "waking-left-0.png"
-   "waking-left-1.png"
-   "waking-left-2.png"))
- (action
-  (name "waking-right")
-  (fps 6.0)
-  (x-offset 6)
-  (y-offset 10)
-  (mirror-action "waking-left"))
-)

diff --git a/data/images/creatures/sspiky/waking-left-0.png b/data/images/creatures/sspiky/waking-left-0.png
deleted file mode 100644 (file)
index 0509325..0000000
Binary files a/data/images/creatures/sspiky/waking-left-0.png and /dev/null differ

diff --git a/data/images/creatures/sspiky/waking-left-1.png b/data/images/creatures/sspiky/waking-left-1.png
deleted file mode 100644 (file)
index 28cb484..0000000
Binary files a/data/images/creatures/sspiky/waking-left-1.png and /dev/null differ

diff --git a/data/images/creatures/sspiky/waking-left-2.png b/data/images/creatures/sspiky/waking-left-2.png
deleted file mode 100644 (file)
index 2ca33ab..0000000
Binary files a/data/images/creatures/sspiky/waking-left-2.png and /dev/null differ

diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp
index 0170230..779c6ff 100644 (file)
--- a/src/badguy/sspiky.cpp
+++ b/src/badguy/sspiky.cpp
@@ -31,7 +31,7 @@ SSpiky::SSpiky(const lisp::Lisp& reader)
   stay_on_platform = false;
   reader.get("stay-on-platform", stay_on_platform);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/sspiky/sspiky.sprite");
+  sprite = sprite_manager->create("images/creatures/spiky/sleepingspiky.sprite");
   state = SSPIKY_SLEEPING;
 }