- moved tux completly to sprites

SVN-Revision: 708

diff --git a/data/supertux.strf b/data/supertux.strf
index 139ea4d..8c3a633 100644 (file)
--- a/data/supertux.strf
+++ b/data/supertux.strf
@@ -1,5 +1,19 @@
 (supertux-resources
- (sprite (name "smalltux")
+ ;; Small Tux Walk
+ (sprite (name "smalltux-walk-left")
+         (fps 15.0)
+         (x-hotspot 5)
+         (y-hotspot 9)
+         (images "shared/smalltux-left-1.png"
+                 "shared/smalltux-left-2.png"
+                 "shared/smalltux-left-3.png"
+                 "shared/smalltux-left-4.png"
+                 "shared/smalltux-left-5.png"
+                 "shared/smalltux-left-6.png"
+                 "shared/smalltux-left-7.png"
+                 "shared/smalltux-left-8.png"))
+
+ (sprite (name "smalltux-walk-right")
          (fps 15.0)
          (x-hotspot 5)
          (y-hotspot 9)
@@ -12,6 +26,129 @@
                  "shared/smalltux-right-7.png"
                  "shared/smalltux-right-8.png"))
 
+ ;; Small Tux Stand
+ (sprite (name "smalltux-stand-left")
+         (fps 15.0)
+         (x-hotspot 0)
+         (y-hotspot 0)
+         (images "shared/smalltux-left-6.png"
+                 ))
+
+ (sprite (name "smalltux-stand-right")
+         (fps 15.0)
+         (x-hotspot 0)
+         (y-hotspot 0)
+         (images "shared/smalltux-right-6.png"))
+
+ ;; Small Tux Jump
+ (sprite (name "smalltux-jump-left")
+         (fps 15.0)
+         (x-hotspot 0)
+         (y-hotspot 0)
+         (images "shared/smalltux-jump-left.png"
+                 ))
+
+ (sprite (name "smalltux-jump-right")
+         (fps 15.0)
+         (x-hotspot 0)
+         (y-hotspot 0)
+         (images "shared/smalltux-jump-right.png"))
+
+ (sprite (name "smalltux-gameover")
+         (fps 10.0)
+         (images "shared/smalltux-gameover-0.png"
+                 "shared/smalltux-gameover-1.png"))
+
+ (sprite (name "smalltux-skid-left")
+         (x-hotspot 6)
+         (y-hotspot 8)
+         (images "shared/smalltux-skid-left.png"))
+
+ (sprite (name "smalltux-skid-right")
+         (x-hotspot 6)
+         (y-hotspot 8)
+         (images "shared/smalltux-skid-right.png"))
+
+ (sprite (name "smalltux-kick-left")
+         (x-hotspot 5)
+         (y-hotspot 9)
+         (images "shared/smalltux-kick-left-0.png"))
+
+ (sprite (name "smalltux-kick-right")
+         (x-hotspot 5)
+         (y-hotspot 9)
+         (images "shared/smalltux-kick-right-0.png"))
+
+ (sprite (name "smalltux-grab-left")
+         (x-hotspot 5)
+         (y-hotspot 9)
+         (images "shared/smalltux-grab-left-0.png"))
+
+ (sprite (name "smalltux-grab-right")
+         (x-hotspot 5)
+         (y-hotspot 9)
+         (images "shared/smalltux-grab-right-0.png"))
+
+ ;; Large Tux Walk
+ (sprite (name "largetux-walk-left")
+         (x-hotspot 6)
+         (y-hotspot 2)
+         (images "shared/largetux-walk-left-0.png"
+                 "shared/largetux-walk-left-1.png"
+                 "shared/largetux-walk-left-2.png"
+                 "shared/largetux-walk-left-3.png"
+                 "shared/largetux-walk-left-4.png"
+                 "shared/largetux-walk-left-5.png"))
+
+ (sprite (name "largetux-walk-right")
+         (x-hotspot 6)
+         (y-hotspot 2)
+         (images "shared/largetux-walk-right-0.png"
+                 "shared/largetux-walk-right-1.png"
+                 "shared/largetux-walk-right-2.png"
+                 "shared/largetux-walk-right-3.png"
+                 "shared/largetux-walk-right-4.png"
+                 "shared/largetux-walk-right-5.png"))
+
+ (sprite (name "largetux-skid-right")
+         (x-hotspot 2)
+         (y-hotspot 3)
+         (images "shared/largetux-skid-right.png"))
+
+ (sprite (name "largetux-skid-left")
+         (x-hotspot 2)
+         (y-hotspot 3)
+         (images "shared/largetux-skid-left.png"))
+        
+ (sprite (name "largetux-stand-left")
+         (x-hotspot 5)
+         (y-hotspot 1)
+         (images "shared/largetux-stand-left.png"))
+
+ (sprite (name "largetux-stand-right")
+         (x-hotspot 5)
+         (y-hotspot 1)
+         (images "shared/largetux-stand-right.png"))
+
+ (sprite (name "largetux-jump-left")
+         (x-hotspot 9)
+         (y-hotspot 2)
+         (images "shared/largetux-jump-left-0.png"))
+ (sprite (name "largetux-jump-right")
+         (x-hotspot 9)
+         (y-hotspot 2)
+         (images "shared/largetux-jump-right-0.png"))
+
+ (sprite (name "largetux-duck-left")
+         (x-hotspot 6)
+         (y-hotspot 2)
+         (images "shared/tux-duck-left.png"))
+ (sprite (name "largetux-duck-right")
+         (x-hotspot 6)
+         (y-hotspot 6)
+         (images "shared/tux-duck-right.png"))
+
+ ;; Laptop
  (sprite (name "laptop-left")
          (x-hotspot 2)
          (y-hotspot 3)
@@ -38,11 +175,11 @@
          (y-hotspot 3)
          (images "shared/mriceblock-flat-right.png"))
 
-; (sprite (name "laptop-falling-left")
-;         (images "shared/laptop-falling-left.png"))
+                                        ; (sprite (name "laptop-falling-left")
+                                        ;         (images "shared/laptop-falling-left.png"))
 
-; (sprite (name "laptop-falling-right")
-;         (images "shared/laptop-falling-right.png"))
+                                        ; (sprite (name "laptop-falling-right")
+                                        ;         (images "shared/laptop-falling-right.png"))
 
  (sprite (name "snowball-squished-left")
          (x-hotspot 1)
@@ -101,7 +238,7 @@
                  "shared/mrbombx-right-1.png"))
 
  (sprite (name "mrbomb-explosion")
-        (fps 15.0)
+         (fps 15.0)
          (x-hotspot 32)
          (y-hotspot 32)
          (images "shared/mrbomb-explosion.png"
@@ -197,56 +334,6 @@
                  "shared/snowball-right-2.png"
                  "shared/snowball-right-1.png"))
 
-
- (sprite (name "largetux-stand-left")
-         (x-hotspot 5)
-         (y-hotspot 1)
-         (images "shared/largetux-stand-left.png"))
-
- (sprite (name "largetux-stand-right")
-         (x-hotspot 5)
-         (y-hotspot 1)
-         (images "shared/largetux-stand-right.png"))
-
- (sprite (name "largetux-walk-left")
-         (x-hotspot 6)
-         (y-hotspot 2)
-         (images "shared/largetux-walk-left-0.png"
-                 "shared/largetux-walk-left-1.png"
-                 "shared/largetux-walk-left-2.png"
-                 "shared/largetux-walk-left-3.png"
-                 "shared/largetux-walk-left-4.png"
-                 "shared/largetux-walk-left-5.png"))
-
- (sprite (name "largetux-walk-right")
-         (x-hotspot 6)
-         (y-hotspot 2)
-         (images "shared/largetux-walk-right-0.png"
-                 "shared/largetux-walk-right-1.png"
-                 "shared/largetux-walk-right-2.png"
-                 "shared/largetux-walk-right-3.png"
-                 "shared/largetux-walk-right-4.png"
-                 "shared/largetux-walk-right-5.png"))
-
- (sprite (name "largetux-jump-left")
-         (x-hotspot 9)
-         (y-hotspot 2)
-         (images "shared/largetux-jump-left-0.png"))
- (sprite (name "largetux-jump-right")
-         (x-hotspot 9)
-         (y-hotspot 2)
-         (images "shared/largetux-jump-right-0.png"))
-
-
- (sprite (name "largetux-duck-left")
-         (x-hotspot 6)
-         (y-hotspot 2)
-         (images "shared/tux-duck-left.png"))
- (sprite (name "largetux-duck-right")
-         (x-hotspot 6)
-         (y-hotspot 6)
-         (images "shared/tux-duck-right.png"))
-
  (sprite (name "egg")
          (images "shared/egg.png"))
  (sprite (name "1up")
@@ -262,48 +349,11 @@
                  "shared/star-1.png"))
  (sprite (name "iceflower")
          (images "shared/iceflower.png"
-          "shared/iceflower-1.png"
-          "shared/iceflower-2.png"
-          "shared/iceflower-3.png"
-          "shared/iceflower-2.png"
-          "shared/iceflower-1.png"))
-
- (sprite (name "smalltux-gameover")
-         (fps 10.0)
-         (images "shared/smalltux-gameover-0.png"
-                 "shared/smalltux-gameover-1.png"))
-
- (sprite (name "smalltux-skid-left")
-         (x-hotspot 6)
-         (y-hotspot 8)
-         (images "shared/smalltux-skid-left.png"))
-
- (sprite (name "smalltux-skid-right")
-         (x-hotspot 6)
-         (y-hotspot 8)
-         (images "shared/smalltux-skid-right.png"))
-
-
- (sprite (name "smalltux-kick-left")
-         (x-hotspot 5)
-         (y-hotspot 9)
-         (images "shared/smalltux-kick-left-0.png"))
-
- (sprite (name "smalltux-kick-right")
-         (x-hotspot 5)
-         (y-hotspot 9)
-         (images "shared/smalltux-kick-right-0.png"))
-
- (sprite (name "smalltux-grab-left")
-         (x-hotspot 5)
-         (y-hotspot 9)
-         (images "shared/smalltux-grab-left-0.png"))
-
- (sprite (name "smalltux-grab-right")
-         (x-hotspot 5)
-         (y-hotspot 9)
-         (images "shared/smalltux-grab-right-0.png"))
-
+                 "shared/iceflower-1.png"
+                 "shared/iceflower-2.png"
+                 "shared/iceflower-3.png"
+                 "shared/iceflower-2.png"
+                 "shared/iceflower-1.png"))
 
  (sprite (name "largetux-kick-left")
          (x-hotspot 5)

diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp
index 29ca52b..657ed3b 100644 (file)
--- a/src/leveleditor.cpp
+++ b/src/leveleditor.cpp
@@ -779,7 +779,7 @@ void le_drawlevel()
 
   /* Draw the player: */
   /* for now, the position is fixed at (100, 240) */
-  tux_right[(global_frame_counter / 5) % 3]->draw( 100 - pos_x, 240);
+  largetux_walk_right->draw( 100 - pos_x, 240);
 }
 
 void le_checkevents()

diff --git a/src/player.cpp b/src/player.cpp
index e097c78..9186fed 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -29,41 +29,41 @@
 #include "screen.h"
 
 Surface* tux_life;
-std::vector<Surface*> tux_right;
-std::vector<Surface*> tux_left;
-
-Surface* smalltux_jump_left;
-Surface* smalltux_jump_right;
-Surface* smalltux_stand_left;
-Surface* smalltux_stand_right;
-Sprite*  smalltux_gameover;
-Sprite*  smalltux_skid_left;
-Sprite*  smalltux_skid_right;
-Sprite*  smalltux_kick_left;
-Sprite*  smalltux_kick_right;
-Sprite*  smalltux_grab_left;
-Sprite*  smalltux_grab_right;
-Sprite*  smalltux_star;
 
+Sprite* smalltux_gameover;
+Sprite* smalltux_star;
 Sprite* largetux_star;
+
+Sprite* smalltux_stand_left;
+Sprite* smalltux_stand_right;
+Sprite* smalltux_walk_right;
+Sprite* smalltux_walk_left;
+Sprite* smalltux_jump_left;
+Sprite* smalltux_jump_right;
+Sprite* smalltux_kick_left;
+Sprite* smalltux_kick_right;
+Sprite* smalltux_skid_left;
+Sprite* smalltux_skid_right;
+Sprite* smalltux_grab_left;
+Sprite* smalltux_grab_right;
+
+Sprite* largetux_stand_left;
+Sprite* largetux_stand_right;
+Sprite* largetux_walk_right;
+Sprite* largetux_walk_left;
+Sprite* largetux_jump_right;
+Sprite* largetux_jump_left;
 Sprite* largetux_kick_left;
 Sprite* largetux_kick_right;
+Sprite* largetux_skid_right;
+Sprite* largetux_skid_left;
 Sprite* largetux_grab_left;
 Sprite* largetux_grab_right;
-Sprite* largetux_stand_left;
-Sprite* largetux_stand_right;
-Sprite* bigtux_right;
-Sprite* bigtux_left;
-Sprite* bigtux_right_jump;
-Sprite* bigtux_left_jump;
-Sprite* ducktux_right;
-Sprite* ducktux_left;
-
-Surface* skidtux_right;
-Surface* skidtux_left;
+Sprite* largetux_duck_right;
+Sprite* largetux_duck_left;
+
 Surface* firetux_right[3];
 Surface* firetux_left[3];
-
 Surface* bigfiretux_right[3];
 Surface* bigfiretux_left[3];
 Surface* bigfiretux_right_jump;
@@ -73,9 +73,6 @@ Surface* duckfiretux_left;
 Surface* skidfiretux_right;
 Surface* skidfiretux_left;
 
-Surface* cape_right[2];
-Surface* cape_left[2];
-
 PlayerKeymap keymap;
 
 PlayerKeymap::PlayerKeymap()
@@ -541,9 +538,9 @@ Player::draw()
                   if (physic.get_velocity_y() != 0)
                     {
                       if (dir == RIGHT)
-                        smalltux_jump_right->draw( base.x - scroll_x, base.y - 10);
+                        smalltux_jump_right->draw(base.x - scroll_x, base.y);
                       else
-                        smalltux_jump_left->draw( base.x - scroll_x, base.y - 10);                   
+                        smalltux_jump_left->draw(base.x - scroll_x, base.y);                   
                     }
                   else
                     {
@@ -557,9 +554,9 @@ Player::draw()
                       else // moving
                         {
                           if (dir == RIGHT)
-                            tux_right[(global_frame_counter/2) % tux_right.size()]->draw(base.x - scroll_x, base.y - 9);
+                            smalltux_walk_right->draw(base.x - scroll_x, base.y);
                           else
-                            tux_left[(global_frame_counter/2) % tux_left.size()]->draw(base.x - scroll_x, base.y - 9);
+                            smalltux_walk_left->draw(base.x - scroll_x, base.y);
                         }
                     }
                 }
@@ -602,33 +599,33 @@ Player::draw()
                               else // walking
                                 {
                                   if (dir == RIGHT)
-                                    bigtux_right->draw(base.x - scroll_x, base.y);
+                                    largetux_walk_right->draw(base.x - scroll_x, base.y);
                                   else
-                                    bigtux_left->draw(base.x - scroll_x, base.y);
+                                    largetux_walk_left->draw(base.x - scroll_x, base.y);
                                 }
                             }
                           else
                             {
                               if (dir == RIGHT)
-                                bigtux_right_jump->draw(base.x - scroll_x, base.y);
+                                largetux_jump_right->draw(base.x - scroll_x, base.y);
                               else
-                                bigtux_left_jump->draw(base.x - scroll_x, base.y);
+                                largetux_jump_left->draw(base.x - scroll_x, base.y);
                             }
                         }
                       else
                         {
                           if (dir == RIGHT)
-                            skidtux_right->draw(base.x - scroll_x - 8, base.y);
+                            largetux_skid_right->draw(base.x - scroll_x - 8, base.y);
                           else
-                            skidtux_left->draw(base.x - scroll_x - 8, base.y);
+                            largetux_skid_left->draw(base.x - scroll_x - 8, base.y);
                         }
                     }
                   else
                     {
                       if (dir == RIGHT)
-                        ducktux_right->draw(base.x - scroll_x, base.y);
+                        largetux_duck_right->draw(base.x - scroll_x, base.y);
                       else
-                        ducktux_left->draw(base.x - scroll_x, base.y);
+                        largetux_duck_left->draw(base.x - scroll_x, base.y);
                     }
                 }
               else

diff --git a/src/player.h b/src/player.h
index 541f179..db7a0de 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -75,38 +75,39 @@ void player_input_init(player_input_type* pplayer_input);
 class Sprite;
 
 extern Surface* tux_life;
-extern std::vector<Surface*> tux_right;
-extern std::vector<Surface*> tux_left;
-extern Surface* smalltux_jump_left;
-extern Surface* smalltux_jump_right;
-extern Surface* smalltux_stand_left;
-extern Surface* smalltux_stand_right;
-extern Sprite*  smalltux_skid_left;
-extern Sprite*  smalltux_skid_right;
-extern Sprite*  smalltux_gameover;
-extern Sprite*  largetux_stand_left;
-extern Sprite*  largetux_stand_right;
-
-extern Sprite*  smalltux_kick_left;
-extern Sprite*  smalltux_kick_right;
-extern Sprite*  smalltux_grab_left;
-extern Sprite*  smalltux_grab_right;
-extern Sprite*  smalltux_star;
-extern Sprite*  largetux_star;
-
-extern Sprite*  largetux_kick_left;
-extern Sprite*  largetux_kick_right;
-extern Sprite*  largetux_grab_left;
-extern Sprite*  largetux_grab_right;
-
-extern Sprite* bigtux_right;
-extern Sprite* bigtux_left;
-extern Sprite* bigtux_right_jump;
-extern Sprite* bigtux_left_jump;
-extern Sprite* ducktux_right;
-extern Sprite* ducktux_left;
-extern Surface* skidtux_right;
-extern Surface* skidtux_left;
+
+extern Sprite* smalltux_gameover;
+extern Sprite* smalltux_star;
+extern Sprite* largetux_star;
+
+extern Sprite* smalltux_stand_left;
+extern Sprite* smalltux_stand_right;
+extern Sprite* smalltux_walk_right;
+extern Sprite* smalltux_walk_left;
+extern Sprite* smalltux_jump_left;
+extern Sprite* smalltux_jump_right;
+extern Sprite* smalltux_kick_left;
+extern Sprite* smalltux_kick_right;
+extern Sprite* smalltux_skid_left;
+extern Sprite* smalltux_skid_right;
+extern Sprite* smalltux_grab_left;
+extern Sprite* smalltux_grab_right;
+
+extern Sprite* largetux_stand_left;
+extern Sprite* largetux_stand_right;
+extern Sprite* largetux_walk_right;
+extern Sprite* largetux_walk_left;
+extern Sprite* largetux_jump_right;
+extern Sprite* largetux_jump_left;
+extern Sprite* largetux_kick_left;
+extern Sprite* largetux_kick_right;
+extern Sprite* largetux_skid_right;
+extern Sprite* largetux_skid_left;
+extern Sprite* largetux_grab_left;
+extern Sprite* largetux_grab_right;
+extern Sprite* largetux_duck_right;
+extern Sprite* largetux_duck_left;
+
 extern Surface* firetux_right[3];
 extern Surface* firetux_left[3];
 extern Surface* bigfiretux_right[3];
@@ -117,10 +118,6 @@ extern Surface* duckfiretux_right;
 extern Surface* duckfiretux_left;
 extern Surface* skidfiretux_right;
 extern Surface* skidfiretux_left;
-extern Surface* cape_right[2];
-extern Surface* cape_left[2];
-extern Surface* bigcape_right[2];
-extern Surface* bigcape_left[2];
 
 class Player
 {

diff --git a/src/resources.cpp b/src/resources.cpp
index 32903e1..e9691e7 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -53,50 +53,43 @@ void loadshared()
   /* Tuxes: */
   smalltux_star = sprite_manager->load("smalltux-star");
   largetux_star = sprite_manager->load("largetux-star");
+  smalltux_gameover = sprite_manager->load("smalltux-gameover");
 
-  smalltux_kick_left  = sprite_manager->load("smalltux-kick-left");
-  smalltux_kick_right = sprite_manager->load("smalltux-kick-right");
-  smalltux_grab_left  = sprite_manager->load("smalltux-grab-left");
-  smalltux_grab_right = sprite_manager->load("smalltux-grab-right");
-
-  largetux_kick_left  = sprite_manager->load("largetux-kick-left");
-  largetux_kick_right = sprite_manager->load("largetux-kick-right");
-  largetux_grab_left  = sprite_manager->load("largetux-grab-left");
-  largetux_grab_right = sprite_manager->load("largetux-grab-right");
+  smalltux_stand_left  = sprite_manager->load("smalltux-stand-left");
+  smalltux_stand_right = sprite_manager->load("smalltux-stand-right");
+  smalltux_walk_left   = sprite_manager->load("smalltux-walk-left");
+  smalltux_walk_right  = sprite_manager->load("smalltux-walk-right");
+  smalltux_jump_left   = sprite_manager->load("smalltux-jump-left");
+  smalltux_jump_right  = sprite_manager->load("smalltux-jump-right");
+  smalltux_kick_left   = sprite_manager->load("smalltux-kick-left");
+  smalltux_kick_right  = sprite_manager->load("smalltux-kick-right");
+  smalltux_skid_left   = sprite_manager->load("smalltux-skid-left");
+  smalltux_skid_right  = sprite_manager->load("smalltux-skid-right");
+  smalltux_grab_left   = sprite_manager->load("smalltux-grab-left");
+  smalltux_grab_right  = sprite_manager->load("smalltux-grab-right");
 
   largetux_stand_left  = sprite_manager->load("largetux-stand-left");
   largetux_stand_right = sprite_manager->load("largetux-stand-right");
+  largetux_walk_left   = sprite_manager->load("largetux-walk-left");
+  largetux_walk_right  = sprite_manager->load("largetux-walk-right");
+  largetux_jump_left   = sprite_manager->load("largetux-jump-left");
+  largetux_jump_right  = sprite_manager->load("largetux-jump-right");
+  largetux_kick_left   = sprite_manager->load("largetux-kick-left");
+  largetux_kick_right  = sprite_manager->load("largetux-kick-right");
+  largetux_skid_right  = sprite_manager->load("largetux-skid-right");
+  largetux_skid_left   = sprite_manager->load("largetux-skid-left");
+  largetux_grab_left   = sprite_manager->load("largetux-grab-left");
+  largetux_grab_right  = sprite_manager->load("largetux-grab-right");
+  largetux_duck_left   = sprite_manager->load("largetux-duck-left");
+  largetux_duck_right  = sprite_manager->load("largetux-duck-right");
 
-  smalltux_gameover = sprite_manager->load("smalltux-gameover");
+  duckfiretux_right = new Surface(datadir +
+               "/images/shared/duckfiretux-right.png",
+               USE_ALPHA);
 
-  smalltux_skid_left  = sprite_manager->load("smalltux-skid-left");
-  smalltux_skid_right = sprite_manager->load("smalltux-skid-right");
-
-  smalltux_stand_left = new Surface(datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA);
-  smalltux_stand_right = new Surface(datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA);
-
-  smalltux_jump_left = new Surface(datadir + "/images/shared/smalltux-jump-left.png", USE_ALPHA);
-  smalltux_jump_right = new Surface(datadir + "/images/shared/smalltux-jump-right.png", USE_ALPHA);
-
-  tux_right.resize(8);
-  tux_right[0] = new Surface(datadir + "/images/shared/smalltux-right-1.png", USE_ALPHA);
-  tux_right[1] = new Surface(datadir + "/images/shared/smalltux-right-2.png", USE_ALPHA);
-  tux_right[2] = new Surface(datadir + "/images/shared/smalltux-right-3.png", USE_ALPHA);
-  tux_right[3] = new Surface(datadir + "/images/shared/smalltux-right-4.png", USE_ALPHA);
-  tux_right[4] = new Surface(datadir + "/images/shared/smalltux-right-5.png", USE_ALPHA);
-  tux_right[5] = new Surface(datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA);
-  tux_right[6] = new Surface(datadir + "/images/shared/smalltux-right-7.png", USE_ALPHA);
-  tux_right[7] = new Surface(datadir + "/images/shared/smalltux-right-8.png", USE_ALPHA);
-
-  tux_left.resize(8);
-  tux_left[0] = new Surface(datadir + "/images/shared/smalltux-left-1.png", USE_ALPHA);
-  tux_left[1] = new Surface(datadir + "/images/shared/smalltux-left-2.png", USE_ALPHA);
-  tux_left[2] = new Surface(datadir + "/images/shared/smalltux-left-3.png", USE_ALPHA);
-  tux_left[3] = new Surface(datadir + "/images/shared/smalltux-left-4.png", USE_ALPHA);
-  tux_left[4] = new Surface(datadir + "/images/shared/smalltux-left-5.png", USE_ALPHA);
-  tux_left[5] = new Surface(datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA);
-  tux_left[6] = new Surface(datadir + "/images/shared/smalltux-left-7.png", USE_ALPHA);
-  tux_left[7] = new Surface(datadir + "/images/shared/smalltux-left-8.png", USE_ALPHA);
+  duckfiretux_left = new Surface(datadir +
+               "/images/shared/duckfiretux-left.png",
+               USE_ALPHA);
 
   firetux_right[0] = new Surface(datadir + "/images/shared/firetux-right-0.png", USE_ALPHA);
   firetux_right[1] = new Surface(datadir + "/images/shared/firetux-right-1.png", USE_ALPHA);
@@ -106,25 +99,6 @@ void loadshared()
   firetux_left[1] = new Surface(datadir + "/images/shared/firetux-left-1.png", USE_ALPHA);
   firetux_left[2] = new Surface(datadir + "/images/shared/firetux-left-2.png", USE_ALPHA);
 
-
-  cape_right[0] = new Surface(datadir + "/images/shared/cape-right-0.png",
-               USE_ALPHA);
-
-  cape_right[1] = new Surface(datadir + "/images/shared/cape-right-1.png",
-               USE_ALPHA);
-
-  cape_left[0] = new Surface(datadir + "/images/shared/cape-left-0.png",
-               USE_ALPHA);
-
-  cape_left[1] = new Surface(datadir + "/images/shared/cape-left-1.png",
-               USE_ALPHA);
-
-  bigtux_right = sprite_manager->load("largetux-walk-right");
-  bigtux_left  = sprite_manager->load("largetux-walk-left");
-
-  bigtux_left_jump  = sprite_manager->load("largetux-jump-left");
-  bigtux_right_jump = sprite_manager->load("largetux-jump-right");
-
   bigfiretux_right[0] = new Surface(datadir + "/images/shared/bigfiretux-right-0.png",
                USE_ALPHA);
 
@@ -147,25 +121,6 @@ void loadshared()
 
   bigfiretux_left_jump = new Surface(datadir + "/images/shared/bigfiretux-left-jump.png", USE_ALPHA);
 
-  ducktux_left  = sprite_manager->load("largetux-duck-left");
-  ducktux_right = sprite_manager->load("largetux-duck-right");
-
-  skidtux_right = new Surface(datadir +
-               "/images/shared/largetux-skid-right.png",
-               USE_ALPHA);
-
-  skidtux_left = new Surface(datadir +
-               "/images/shared/largetux-skid-left.png",
-               USE_ALPHA);
-
-  duckfiretux_right = new Surface(datadir +
-               "/images/shared/duckfiretux-right.png",
-               USE_ALPHA);
-
-  duckfiretux_left = new Surface(datadir +
-               "/images/shared/duckfiretux-left.png",
-               USE_ALPHA);
-
   skidfiretux_right = new Surface(datadir +
                "/images/shared/skidfiretux-right.png",
                USE_ALPHA);
@@ -285,32 +240,10 @@ void unloadshared(void)
   int i;
 
   free_special_gfx();
+  free_badguy_gfx();
 
   delete smalltux_gameover;
 
-  for (i = 0; i < 3; i++)
-    {
-      delete tux_right[i];
-      delete tux_left[i];
-    }
-
-  delete bigtux_right_jump;
-  delete bigtux_left_jump;
-
-  for (i = 0; i < 2; i++)
-    {
-      delete cape_right[i];
-      delete cape_left[i];
-    }
-
-  delete ducktux_left;
-  delete ducktux_right;
-
-  delete skidtux_left;
-  delete skidtux_right;
-
-  free_badguy_gfx();
-
   delete img_water;
   for (i = 0; i < 3; i++)
     delete img_waves[i];