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 (file)
index 0000000..7eaae12
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 (file)
index 0000000..e0eabdc
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 (file)
index 0000000..473dad3
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 (file)
index 0000000..6b886cd
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 5f03121..576fbd2 100644 (file)
--- 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 (file)
index e442e97..0000000
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 (file)
index e6566af..0000000
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 (file)
index 2439592..0000000
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 f6d745a..7ca7c6b 100644 (file)
--- 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);