Added death sprite for Kirby

diff --git a/data/images/creatures/kirby/kirby.sprite b/data/images/creatures/kirby/kirby.sprite
index 97fba4d..0286bff 100644 (file)
--- a/data/images/creatures/kirby/kirby.sprite
+++ b/data/images/creatures/kirby/kirby.sprite
@@ -1,5 +1,4 @@
 (supertux-sprite
- 
   (action
     (name "left")
     (fps 20)
@@ -20,4 +19,15 @@
     (hitbox 8 12 38 38)
     (mirror-action "left")
   )
+
+  (action
+    (name "squished-left")
+    (hitbox 8 -5 38 38)
+    (images "squished-left.png")
+  )
+  (action
+    (name "squished-right")
+    (hitbox 8 -5 38 38)
+    (mirror-action "squished-left")
+  )
 )

diff --git a/data/images/creatures/kirby/squished-left.png b/data/images/creatures/kirby/squished-left.png
new file mode 100644 (file)
index 0000000..227e683
Binary files /dev/null and b/data/images/creatures/kirby/squished-left.png differ

diff --git a/src/badguy/kirby.cpp b/src/badguy/kirby.cpp
index 46df9cf..ec54404 100644 (file)
--- a/src/badguy/kirby.cpp
+++ b/src/badguy/kirby.cpp
@@ -35,7 +35,7 @@ Kirby::Kirby(const Vector& pos, Direction d, std::string script)
 bool
 Kirby::collision_squished(GameObject& object)
 {
-  //sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
+  sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
   kill_squished(object);
   return true;
 }