- added fire duck tux

- turned iceflower into a fire flower

SVN-Revision: 805

diff --git a/data/images/shared/firetux-duck-left.png b/data/images/shared/firetux-duck-left.png
new file mode 100644 (file)
index 0000000..52f5b47
Binary files /dev/null and b/data/images/shared/firetux-duck-left.png differ

diff --git a/data/images/shared/firetux-duck-right.png b/data/images/shared/firetux-duck-right.png
new file mode 100644 (file)
index 0000000..fc6ab8a
Binary files /dev/null and b/data/images/shared/firetux-duck-right.png differ

diff --git a/data/images/shared/iceflower-1.png b/data/images/shared/iceflower-1.png
index d5735fc..86424ed 100644 (file)
Binary files a/data/images/shared/iceflower-1.png and b/data/images/shared/iceflower-1.png differ

diff --git a/data/images/shared/iceflower-2.png b/data/images/shared/iceflower-2.png
index 6d48ad5..f88bc71 100644 (file)
Binary files a/data/images/shared/iceflower-2.png and b/data/images/shared/iceflower-2.png differ

diff --git a/data/images/shared/iceflower-3.png b/data/images/shared/iceflower-3.png
index 5710534..205b87f 100644 (file)
Binary files a/data/images/shared/iceflower-3.png and b/data/images/shared/iceflower-3.png differ

diff --git a/data/images/shared/iceflower.png b/data/images/shared/iceflower.png
index 2e2077c..b6d6f67 100644 (file)
Binary files a/data/images/shared/iceflower.png and b/data/images/shared/iceflower.png differ

diff --git a/data/levels/world1/level19.stl b/data/levels/world1/level19.stl
index 65eb6bf..e880bab 100644 (file)
--- a/data/levels/world1/level19.stl
+++ b/data/levels/world1/level19.stl
@@ -82,7 +82,7 @@
     (mrbomb  (x 2152) (y 361))
     (mrbomb  (x 2257) (y 363))
     (spiky  (x 2864) (y 370))
-    (money  (x 4738) (y 346))
+    (money  (x 4714) (y 346))
     (mrbomb  (x 6252) (y 302))
     (snowball  (x 5836) (y 376))
     (snowball  (x 5789) (y 375))

diff --git a/data/supertux.strf b/data/supertux.strf
index 29da5b2..2d31427 100644 (file)
--- a/data/supertux.strf
+++ b/data/supertux.strf
@@ -241,11 +241,11 @@
  (sprite (name "firetux-duck-left")
          (x-hotspot 6)
          (y-hotspot 6)
-         (images "shared/tux-duck-left.png"))
+         (images "shared/firetux-duck-left.png"))
  (sprite (name "firetux-duck-right")
          (x-hotspot 6)
          (y-hotspot 6)
-         (images "shared/tux-duck-right.png"))
+         (images "shared/firetux-duck-right.png"))
 
 
  (sprite (name "firetux-kick-left")

diff --git a/src/player.cpp b/src/player.cpp
index 6298cc5..5cdcbd4 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -510,13 +510,13 @@ Player::draw()
           else
             sprite = &largetux;
           
-          if (duck)
+          if (duck && size != SMALL)
             {
               if (dir == RIGHT)
                 sprite->duck_right->draw(base.x - scroll_x, base.y);
               else 
                 sprite->duck_left->draw(base.x - scroll_x, base.y);
-            }                    
+            }
           else if (skidding_timer.started())
             {
               if (dir == RIGHT)