From: LMH <lmh.0013@gmail.com>
Date: Thu, 18 Dec 2014 18:45:14 +0000 (-1000)
Subject: Woldmap images for earthtux
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b50df911f1042a17f1ed0a1afb8c23a4502186b4;p=supertux.git

Woldmap images for earthtux
---

diff --git a/data/images/worldmap/common/smalltux1_earth.png b/data/images/worldmap/common/smalltux1_earth.png
new file mode 100644
index 000000000..8807bf080
Binary files /dev/null and b/data/images/worldmap/common/smalltux1_earth.png differ
diff --git a/data/images/worldmap/common/smalltux2_earth.png b/data/images/worldmap/common/smalltux2_earth.png
new file mode 100644
index 000000000..efe459522
Binary files /dev/null and b/data/images/worldmap/common/smalltux2_earth.png differ
diff --git a/data/images/worldmap/common/smalltux3_earth.png b/data/images/worldmap/common/smalltux3_earth.png
new file mode 100644
index 000000000..9b8ef9119
Binary files /dev/null and b/data/images/worldmap/common/smalltux3_earth.png differ
diff --git a/data/images/worldmap/common/smalltux4_earth.png b/data/images/worldmap/common/smalltux4_earth.png
new file mode 100644
index 000000000..9c9c6ce5f
Binary files /dev/null and b/data/images/worldmap/common/smalltux4_earth.png differ
diff --git a/data/images/worldmap/common/smalltux5_earth.png b/data/images/worldmap/common/smalltux5_earth.png
new file mode 100644
index 000000000..5a67d4570
Binary files /dev/null and b/data/images/worldmap/common/smalltux5_earth.png differ
diff --git a/data/images/worldmap/common/smalltux6_earth.png b/data/images/worldmap/common/smalltux6_earth.png
new file mode 100644
index 000000000..745064131
Binary files /dev/null and b/data/images/worldmap/common/smalltux6_earth.png differ
diff --git a/data/images/worldmap/common/smalltux7_earth.png b/data/images/worldmap/common/smalltux7_earth.png
new file mode 100644
index 000000000..1d11aa4bb
Binary files /dev/null and b/data/images/worldmap/common/smalltux7_earth.png differ
diff --git a/data/images/worldmap/common/smalltux8_earth.png b/data/images/worldmap/common/smalltux8_earth.png
new file mode 100644
index 000000000..985d30532
Binary files /dev/null and b/data/images/worldmap/common/smalltux8_earth.png differ
diff --git a/data/images/worldmap/common/smalltux9.png b/data/images/worldmap/common/smalltux9.png
deleted file mode 100644
index 2c277dc4d..000000000
Binary files a/data/images/worldmap/common/smalltux9.png and /dev/null differ
diff --git a/data/images/worldmap/common/smalltux_earth.png b/data/images/worldmap/common/smalltux_earth.png
new file mode 100644
index 000000000..0cd567ed2
Binary files /dev/null and b/data/images/worldmap/common/smalltux_earth.png differ
diff --git a/data/images/worldmap/common/tux.sprite b/data/images/worldmap/common/tux.sprite
index 04b733b62..8663bc24b 100644
--- a/data/images/worldmap/common/tux.sprite
+++ b/data/images/worldmap/common/tux.sprite
@@ -56,6 +56,7 @@
   (name "fire-walking")
   (hitbox 5 20 0 0)
   (images "smalltux_fire.png"
+          "smalltux1_fire.png"
           "smalltux2_fire.png"
           "smalltux3_fire.png"
           "smalltux4_fire.png"
@@ -80,6 +81,7 @@
   (name "ice-walking")
   (hitbox 5 20 0 0)
   (images "smalltux_ice.png"
+          "smalltux1_ice.png"
           "smalltux2_ice.png"
           "smalltux3_ice.png"
           "smalltux4_ice.png"
@@ -100,5 +102,55 @@
   (hitbox 5 20 0 0)
   (images "smalltux_ice.png")
  )
+  (action
+  (name "air-walking")
+  (hitbox 5 20 0 0)
+  (images "smalltux_air.png"
+          "smalltux1_air.png"
+          "smalltux2_air.png"
+          "smalltux3_air.png"
+          "smalltux4_air.png"
+          "smalltux5_air.png"
+          "smalltux6_air.png"
+          "smalltux7_air.png"
+          "smalltux8_air.png"
+          "smalltux6_air.png"
+          "smalltux5_air.png"
+          "smalltux4_air.png"
+          "smalltux3_air.png"
+          "smalltux2_air.png"
+          "smalltux1_air.png"
+          "smalltux_air.png")
+ )
+ (action
+  (name "air-stop")
+  (hitbox 5 20 0 0)
+  (images "smalltux_air.png")
+ )
+  (action
+  (name "earth-walking")
+  (hitbox 5 20 0 0)
+  (images "smalltux_earth.png"
+          "smalltux1_earth.png"
+          "smalltux2_earth.png"
+          "smalltux3_earth.png"
+          "smalltux4_earth.png"
+          "smalltux5_earth.png"
+          "smalltux6_earth.png"
+          "smalltux7_earth.png"
+          "smalltux8_earth.png"
+          "smalltux6_earth.png"
+          "smalltux5_earth.png"
+          "smalltux4_earth.png"
+          "smalltux3_earth.png"
+          "smalltux2_earth.png"
+          "smalltux1_earth.png"
+          "smalltux_earth.png")
+ )
+ (action
+  (name "earth-stop")
+  (hitbox 5 20 0 0)
+  (images "smalltux_earth.png")
+ )
 )
 
diff --git a/src/worldmap/tux.cpp b/src/worldmap/tux.cpp
index 2ea454b37..365b98537 100644
--- a/src/worldmap/tux.cpp
+++ b/src/worldmap/tux.cpp
@@ -69,10 +69,10 @@ Tux::draw(DrawingContext& context)
       sprite->set_action(moving ? "ice-walking" : "ice-stop");
       break;
     case AIR_BONUS:
-      sprite->set_action(moving ? "ice-walking" : "ice-stop");
+      sprite->set_action(moving ? "air-walking" : "air-stop");
       break;
     case EARTH_BONUS:
-      sprite->set_action(moving ? "fire-walking" : "fire-stop");
+      sprite->set_action(moving ? "earth-walking" : "earth-stop");
       break;
     case NO_BONUS:
       sprite->set_action(moving ? "small-walking" : "small-stop");