From: Stephen Groundwater <slacker@gluebox.com>
Date: Thu, 3 Nov 2005 02:32:26 +0000 (+0000)
Subject: ice yeti animation updates
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5af97e8b9826798f48b52c8eab6d5c9160cec134;p=supertux.git

ice yeti animation updates

SVN-Revision: 2933
---

diff --git a/data/images/creatures/yeti/iceyeti.xcf b/data/images/creatures/yeti/iceyeti.xcf
new file mode 100644
index 000000000..7eaae1239
Binary files /dev/null and b/data/images/creatures/yeti/iceyeti.xcf differ
diff --git a/data/images/creatures/yeti/iceyeti_0.png b/data/images/creatures/yeti/iceyeti_0.png
new file mode 100644
index 000000000..e0eabdc21
Binary files /dev/null and b/data/images/creatures/yeti/iceyeti_0.png differ
diff --git a/data/images/creatures/yeti/iceyeti_1.png b/data/images/creatures/yeti/iceyeti_1.png
new file mode 100644
index 000000000..473dad3a0
Binary files /dev/null and b/data/images/creatures/yeti/iceyeti_1.png differ
diff --git a/data/images/creatures/yeti/iceyeti_2.png b/data/images/creatures/yeti/iceyeti_2.png
new file mode 100644
index 000000000..6b886cd46
Binary files /dev/null and b/data/images/creatures/yeti/iceyeti_2.png differ
diff --git a/data/images/creatures/yeti/yeti.sprite b/data/images/creatures/yeti/yeti.sprite
index 5f03121bb..576fbd2e7 100644
--- a/data/images/creatures/yeti/yeti.sprite
+++ b/data/images/creatures/yeti/yeti.sprite
@@ -1,16 +1,22 @@
 (supertux-sprite
   (action
     (name "right")
-    (images "yeti_b.png"
-   "yeti_b1.png")
+    (images "iceyeti_0.png"  
+	    "iceyeti_1.png"
+	    "iceyeti_2.png"
+ 	    "iceyeti_1.png")
   )
   (action
     (name "left")
     (mirror-action "right")
   )
   (action
-    (name "angry_jumping")
-    (images "yeti_c.png")
+    (name "jump-right")
+    (images "iceyeti_jump.png")
+  )
+  (action
+    (name "jump-left")
+    (mirror-action "jump-right")
   )
 )
   
diff --git a/data/images/creatures/yeti/yeti_b.png b/data/images/creatures/yeti/yeti_b.png
deleted file mode 100644
index e442e970d..000000000
Binary files a/data/images/creatures/yeti/yeti_b.png and /dev/null differ
diff --git a/data/images/creatures/yeti/yeti_b1.png b/data/images/creatures/yeti/yeti_b1.png
deleted file mode 100644
index e6566af3b..000000000
Binary files a/data/images/creatures/yeti/yeti_b1.png and /dev/null differ
diff --git a/data/images/creatures/yeti/yeti_c.png b/data/images/creatures/yeti/yeti_c.png
deleted file mode 100644
index 2439592da..000000000
Binary files a/data/images/creatures/yeti/yeti_c.png and /dev/null differ
diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index f6d745aed..7ca7c6be6 100644
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -224,6 +224,8 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit)
     } else if(state == ANGRY_JUMPING) {
       if(!timer.started()) {
         // we just landed
+       // FixME need help here setting the walk,stand,jump image states
+	sprite->set_action("jump-right");
         jumpcount++;
         // make a stalactite falling down and shake camera a bit
         Sector::current()->camera->shake(.1, 0, 10);