From: Christoph Sommer <mail@christoph-sommer.de>
Date: Sun, 20 Jan 2008 15:29:50 +0000 (+0000)
Subject: Fire Tux for single-sprite version of tux
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=975056dd17a65a96ff87085d915001f3ea485357;p=supertux.git

Fire Tux for single-sprite version of tux

SVN-Revision: 5290
---

diff --git a/data/images/creatures/tux/fire/backflip-0.png b/data/images/creatures/tux/fire/backflip-0.png
new file mode 100644
index 000000000..243cbabd9
Binary files /dev/null and b/data/images/creatures/tux/fire/backflip-0.png differ
diff --git a/data/images/creatures/tux/fire/backflip-1.png b/data/images/creatures/tux/fire/backflip-1.png
new file mode 100644
index 000000000..2fd0919f4
Binary files /dev/null and b/data/images/creatures/tux/fire/backflip-1.png differ
diff --git a/data/images/creatures/tux/fire/backflip-2.png b/data/images/creatures/tux/fire/backflip-2.png
new file mode 100644
index 000000000..ecd12d580
Binary files /dev/null and b/data/images/creatures/tux/fire/backflip-2.png differ
diff --git a/data/images/creatures/tux/fire/backflip-3.png b/data/images/creatures/tux/fire/backflip-3.png
new file mode 100644
index 000000000..9fc2eb4db
Binary files /dev/null and b/data/images/creatures/tux/fire/backflip-3.png differ
diff --git a/data/images/creatures/tux/fire/backflip-4.png b/data/images/creatures/tux/fire/backflip-4.png
new file mode 100644
index 000000000..243cbabd9
Binary files /dev/null and b/data/images/creatures/tux/fire/backflip-4.png differ
diff --git a/data/images/creatures/tux/fire/buttjump-0.png b/data/images/creatures/tux/fire/buttjump-0.png
new file mode 100644
index 000000000..7b90997a0
Binary files /dev/null and b/data/images/creatures/tux/fire/buttjump-0.png differ
diff --git a/data/images/creatures/tux/fire/duck-0.png b/data/images/creatures/tux/fire/duck-0.png
new file mode 100644
index 000000000..9e1478ecf
Binary files /dev/null and b/data/images/creatures/tux/fire/duck-0.png differ
diff --git a/data/images/creatures/tux/fire/idle-0.png b/data/images/creatures/tux/fire/idle-0.png
new file mode 100644
index 000000000..48f819e5e
Binary files /dev/null and b/data/images/creatures/tux/fire/idle-0.png differ
diff --git a/data/images/creatures/tux/fire/idle-1.png b/data/images/creatures/tux/fire/idle-1.png
new file mode 100644
index 000000000..b4fb1a8ab
Binary files /dev/null and b/data/images/creatures/tux/fire/idle-1.png differ
diff --git a/data/images/creatures/tux/fire/jump-0.png b/data/images/creatures/tux/fire/jump-0.png
new file mode 100644
index 000000000..b045821db
Binary files /dev/null and b/data/images/creatures/tux/fire/jump-0.png differ
diff --git a/data/images/creatures/tux/fire/kick-0.png b/data/images/creatures/tux/fire/kick-0.png
new file mode 100644
index 000000000..e7fde147e
Binary files /dev/null and b/data/images/creatures/tux/fire/kick-0.png differ
diff --git a/data/images/creatures/tux/fire/skid-0.png b/data/images/creatures/tux/fire/skid-0.png
new file mode 100644
index 000000000..3002762b5
Binary files /dev/null and b/data/images/creatures/tux/fire/skid-0.png differ
diff --git a/data/images/creatures/tux/fire/stand-0.png b/data/images/creatures/tux/fire/stand-0.png
new file mode 100644
index 000000000..c15f6e627
Binary files /dev/null and b/data/images/creatures/tux/fire/stand-0.png differ
diff --git a/data/images/creatures/tux/fire/walk-0.png b/data/images/creatures/tux/fire/walk-0.png
new file mode 100644
index 000000000..b83550b77
Binary files /dev/null and b/data/images/creatures/tux/fire/walk-0.png differ
diff --git a/data/images/creatures/tux/fire/walk-1.png b/data/images/creatures/tux/fire/walk-1.png
new file mode 100644
index 000000000..afe4a37ea
Binary files /dev/null and b/data/images/creatures/tux/fire/walk-1.png differ
diff --git a/data/images/creatures/tux/fire/walk-2.png b/data/images/creatures/tux/fire/walk-2.png
new file mode 100644
index 000000000..8d929e9c6
Binary files /dev/null and b/data/images/creatures/tux/fire/walk-2.png differ
diff --git a/data/images/creatures/tux/fire/walk-3.png b/data/images/creatures/tux/fire/walk-3.png
new file mode 100644
index 000000000..c586d7e4d
Binary files /dev/null and b/data/images/creatures/tux/fire/walk-3.png differ
diff --git a/data/images/creatures/tux/fire/walk-4.png b/data/images/creatures/tux/fire/walk-4.png
new file mode 100644
index 000000000..c2ba7e3fc
Binary files /dev/null and b/data/images/creatures/tux/fire/walk-4.png differ
diff --git a/data/images/creatures/tux/fire/walk-5.png b/data/images/creatures/tux/fire/walk-5.png
new file mode 100644
index 000000000..2b6654269
Binary files /dev/null and b/data/images/creatures/tux/fire/walk-5.png differ
diff --git a/data/images/creatures/tux/tux.sprite b/data/images/creatures/tux/tux.sprite
index fb9c38363..9f32b1aca 100644
--- a/data/images/creatures/tux/tux.sprite
+++ b/data/images/creatures/tux/tux.sprite
@@ -221,4 +221,122 @@
          (hitbox 16 5 32 64)
          (mirror-action "big-buttjump-right"))
 
+; Fire Tux
+
+       (action
+         (name "fire-walk-right")
+         (fps 15.0)
+         (hitbox 16 13 32 64)
+         (images "fire/walk-0.png"
+                 "fire/walk-1.png"
+                 "fire/walk-2.png"
+                 "fire/walk-3.png"
+                 "fire/walk-4.png"
+                 "fire/walk-5.png"))
+
+       (action
+         (name "fire-walk-left")
+         (fps 15.0)
+         (hitbox 16 13 32 64)
+         (mirror-action "fire-walk-right"))
+
+       (action
+         (name "fire-stand-right")
+         (fps 15.0)
+         (hitbox 16 13 32 64)
+         (images "fire/stand-0.png"))
+
+       (action
+         (name "fire-stand-left")
+         (fps 15.0)
+         (hitbox 16 13 32 64)
+         (mirror-action "fire-stand-right"))
+
+       (action
+         (name "fire-jump-right")
+         (fps 15.0)
+         (hitbox 16 13 32 64)
+         (images "fire/jump-0.png"))
+
+       (action
+         (name "fire-jump-left")
+         (fps 15.0)
+         (hitbox 16 13 32 64)
+         (mirror-action "fire-jump-right"))
+
+       (action
+         (name "fire-skid-right")
+         (hitbox 16 13 32 64)
+         (images "fire/skid-0.png"))
+
+       (action
+         (name "fire-skid-left")
+         (hitbox 16 13 32 64)
+         (mirror-action "fire-skid-right"))
+
+       (action
+         (name "fire-kick-right")
+         (hitbox 16 13 32 64)
+         (images "fire/kick-0.png"))
+
+       (action
+         (name "fire-kick-left")
+         (hitbox 16 13 32 64)
+         (mirror-action "fire-kick-right"))
+
+       (action
+         (name "fire-idle-right")
+         (fps 5.0)
+         (hitbox 16 13 32 64)
+         (images "fire/idle-0.png"
+                 "fire/idle-1.png"
+                 "fire/idle-0.png"))
+
+       (action
+         (name "fire-idle-left")
+         (hitbox 16 13 32 64)
+         (mirror-action "fire-idle-right"))
+
+       (action
+         (name "fire-duck-right")
+         (hitbox 16 37 32 32)
+         (images "fire/duck-0.png"))
+
+       (action
+         (name "fire-duck-left")
+         (hitbox 16 37 32 32)
+         (mirror-action "fire-duck-right"))
+
+       (action
+         (name "fire-backflip-right")
+         (hitbox 16 37 32 32)
+         (fps 9.0)
+         (images "fire/backflip-0.png"
+                 "fire/backflip-1.png"
+                 "fire/backflip-2.png"
+                 "fire/backflip-3.png"
+                 "fire/backflip-4.png"
+                 "fire/backflip-0.png"
+                 "fire/backflip-0.png"
+                 "fire/backflip-0.png"
+                 "fire/backflip-0.png"
+                 "fire/backflip-0.png"))
+
+       (action
+         (name "fire-backflip-left")
+         (hitbox 16 37 32 32)
+         (fps 9.0)
+         (mirror-action "fire-backflip-right"))
+
+       (action
+         (name "fire-buttjump-right")
+         (hitbox 16 13 32 64)
+         (images "fire/buttjump-0.png"))
+
+       (action
+         (name "fire-buttjump-left")
+         (hitbox 16 13 32 64)
+         (mirror-action "fire-buttjump-right"))
+
+
 )
diff --git a/src/object/player.cpp b/src/object/player.cpp
index 72e4debd5..e6cce1f4b 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -911,9 +911,9 @@ Player::draw(DrawingContext& context)
   if (player_status->bonus == GROWUP_BONUS)
     sa_prefix = "big";
   else if (player_status->bonus == FIRE_BONUS)
-    sa_prefix = "big";
+    sa_prefix = "fire";
   else if (player_status->bonus == ICE_BONUS)
-    sa_prefix = "big";
+    sa_prefix = "fire";
   else
     sa_prefix = "small";