X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy.cpp;h=2d1de29d99701c2f882dfe29ad41996f02dde24c;hb=ee6db785e8eff4883da70b404a9bdb4a42e75ac3;hp=8aefbff35c85f5ef719a4135e236b7b09fa303e8;hpb=9d4bf412a0bdf148f3d728ac1cd05beb2963be9c;p=supertux.git

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 8aefbff35..2d1de29d9 100644
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -1,14 +1,26 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2004 Matthias Braun <matze@braunis.de>
 //
-// C Implementation: badguy
-//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de> & Bill Kendrick, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+
+#include <iostream>
 #include <math.h>
 
 #include "globals.h"
@@ -16,42 +28,47 @@
 #include "badguy.h"
 #include "scene.h"
 #include "screen.h"
+#include "world.h"
 #include "tile.h"
-
-texture_type img_bsod_squished_left[1];
-texture_type img_bsod_squished_right[1];
-texture_type img_bsod_falling_left[1];
-texture_type img_bsod_falling_right[1];
-texture_type img_laptop_flat_left[1];
-texture_type img_laptop_flat_right[1];
-texture_type img_laptop_falling_left[1];
-texture_type img_laptop_falling_right[1];
-texture_type img_bsod_left[4];
-texture_type img_bsod_right[4];
-texture_type img_laptop_left[4];
-texture_type img_laptop_right[4];
-texture_type img_money_left[2];
-texture_type img_money_right[2];
-texture_type img_mrbomb_left[4];
-texture_type img_mrbomb_right[4];
-texture_type img_mrbomb_ticking_left[1];
-texture_type img_mrbomb_ticking_right[1];
-texture_type img_mrbomb_explosion[1];
-texture_type img_stalactite[1];
-texture_type img_stalactite_broken[1];
-texture_type img_flame[2];
-texture_type img_fish[2];
-texture_type img_bouncingsnowball_left[6];
-texture_type img_bouncingsnowball_right[6];
-texture_type img_bouncingsnowball_squished[1];
-texture_type img_flyingsnowball[2];
-texture_type img_flyingsnowball_squished[1];
-texture_type img_spiky_left[3];
-texture_type img_spiky_right[3];
-texture_type img_snowball_left[4];
-texture_type img_snowball_right[4];
-texture_type img_snowball_squished_left[1];
-texture_type img_snowball_squished_right[1];
+#include "resources.h"
+#include "sprite_manager.h"
+
+Sprite* img_bsod_squished_left;
+Sprite* img_bsod_squished_right;
+Sprite* img_bsod_falling_left;
+Sprite* img_bsod_falling_right;
+Sprite* img_laptop_flat_left;
+Sprite* img_laptop_flat_right;
+Sprite* img_laptop_falling_left;
+Sprite* img_laptop_falling_right;
+Sprite* img_bsod_left;
+Sprite* img_bsod_right;
+Sprite* img_laptop_left;
+Sprite* img_laptop_right;
+Sprite* img_jumpy_left_up;
+Sprite* img_jumpy_left_down;
+Sprite* img_jumpy_left_middle;
+Sprite* img_mrbomb_left;
+Sprite* img_mrbomb_right;
+Sprite* img_mrbomb_ticking_left;
+Sprite* img_mrbomb_ticking_right;
+Sprite* img_mrbomb_explosion;
+Sprite* img_stalactite;
+Sprite* img_stalactite_broken;
+Sprite* img_flame;
+Sprite* img_fish;
+Sprite* img_fish_down;
+Sprite* img_bouncingsnowball_left;
+Sprite* img_bouncingsnowball_right;
+Sprite* img_bouncingsnowball_squished;
+Sprite* img_flyingsnowball;
+Sprite* img_flyingsnowball_squished;
+Sprite* img_spiky_left;
+Sprite* img_spiky_right;
+Sprite* img_snowball_left;
+Sprite* img_snowball_right;
+Sprite* img_snowball_squished_left;
+Sprite* img_snowball_squished_right;
 
 BadGuyKind  badguykind_from_string(const std::string& str)
 {
@@ -127,7 +144,7 @@ std::string badguykind_to_string(BadGuyKind kind)
 }
 
 void
-BadGuy::init(float x, float y, BadGuyKind kind_)
+BadGuy::init(float x, float y, BadGuyKind kind_, bool stay_on_platform_)
 {
   base.x   = x;
   base.y   = y;    
@@ -136,6 +153,7 @@ BadGuy::init(float x, float y, BadGuyKind kind_)
   base.xm  = 0;
   base.ym  = 0;
 
+  stay_on_platform = stay_on_platform_;
   mode     = NORMAL;
   dying    = DYING_NOT;
   kind     = kind_;
@@ -145,47 +163,47 @@ BadGuy::init(float x, float y, BadGuyKind kind_)
   animation_speed = 1;
   animation_length = 1;
   animation_offset = 0;
-  texture_left = texture_right = 0;
+  sprite_left = sprite_right = 0;
   physic.reset();
-  timer_init(&timer, true);
+  timer.init(true);
 
   if(kind == BAD_BSOD) {
     physic.set_velocity(-1.3, 0);
-    set_texture(img_bsod_left, img_bsod_right, 4);
+    set_sprite(img_bsod_left, img_bsod_right, 4);
   } else if(kind == BAD_MRBOMB) {
     physic.set_velocity(-1.3, 0);
-    set_texture(img_mrbomb_left, img_mrbomb_right, 4);
+    set_sprite(img_mrbomb_left, img_mrbomb_right, 4);
   } else if (kind == BAD_LAPTOP) {
-    physic.set_velocity(-1.3, 0);
-    set_texture(img_laptop_left, img_laptop_right, 4, 5);
+    physic.set_velocity(-.8, 0);
+    set_sprite(img_laptop_left, img_laptop_right, 4, 5);
   } else if(kind == BAD_MONEY) {
-    set_texture(img_money_left, img_money_right, 1);
+    set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1);
   } else if(kind == BAD_BOMB) {
-    set_texture(img_mrbomb_ticking_left, img_mrbomb_ticking_right, 1);
+    set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right, 1);
     // hack so that the bomb doesn't hurt until it expldes...
     dying = DYING_SQUISHED;
   } else if(kind == BAD_FLAME) {
     base.ym = 0; // we misuse base.ym as angle for the flame
     physic.enable_gravity(false);
-    set_texture(img_flame, img_flame, 2, 0.5);
+    set_sprite(img_flame, img_flame, 2, 0.5);
   } else if(kind == BAD_BOUNCINGSNOWBALL) {
     physic.set_velocity(-1.3, 0);
-    set_texture(img_bouncingsnowball_left, img_bouncingsnowball_right, 6);
+    set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right, 6);
   } else if(kind == BAD_STALACTITE) {
     physic.enable_gravity(false);
-    set_texture(img_stalactite, img_stalactite, 1);
+    set_sprite(img_stalactite, img_stalactite, 1);
   } else if(kind == BAD_FISH) {
-    set_texture(img_fish, img_fish, 2, 1);
+    set_sprite(img_fish, img_fish, 2, 1);
     physic.enable_gravity(true);
   } else if(kind == BAD_FLYINGSNOWBALL) {
-    set_texture(img_flyingsnowball, img_flyingsnowball, 2, 5);
+    set_sprite(img_flyingsnowball, img_flyingsnowball, 2, 5);
     physic.enable_gravity(false);
   } else if(kind == BAD_SPIKY) {
     physic.set_velocity(-1.3, 0);
-    set_texture(img_spiky_left, img_spiky_right, 3);
+    set_sprite(img_spiky_left, img_spiky_right, 3);
   } else if(kind == BAD_SNOWBALL) {
     physic.set_velocity(-1.3, 0);
-    set_texture(img_snowball_left, img_snowball_right, 4, 5);
+    set_sprite(img_snowball_left, img_snowball_right, 4, 5);
   }
 
   // if we're in a solid tile at start correct that now
@@ -197,7 +215,7 @@ BadGuy::init(float x, float y, BadGuyKind kind_)
 }
 
 void
-BadGuy::action_bsod()
+BadGuy::action_bsod(float frame_ratio)
 {
   static const float BSODJUMP = 2;
     
@@ -208,13 +226,14 @@ BadGuy::action_bsod()
 
   // jump when we're about to fall
   if (physic.get_velocity_y() == 0 && 
-          !issolid(base.x+base.width/2, base.y + base.height)) {
-    physic.enable_gravity(true);
-    physic.set_velocity(physic.get_velocity_x(), BSODJUMP);
-  }
+      !issolid(base.x+base.width/2, base.y + base.height)) 
+    {
+      physic.enable_gravity(true);
+      physic.set_velocity(physic.get_velocity_x(), BSODJUMP);
+    }
 
   // Handle dying timer:
-  if (dying == DYING_SQUISHED && !timer_check(&timer))       
+  if (dying == DYING_SQUISHED && !timer.check())
     {
       /* Remove it if time's up: */
       remove_me();
@@ -222,28 +241,31 @@ BadGuy::action_bsod()
     }
 
   // move
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if(dying != DYING_FALLING)
     collision_swept_object_map(&old_base, &base);
 }
 
 void
-BadGuy::action_laptop()
+BadGuy::action_laptop(float frame_ratio)
 {
-  fall();
+  Player& tux = *World::current()->get_tux();
+
+  if(dying == DYING_NOT)
+    fall();
   
   /* Move left/right: */
   if (mode == NORMAL || mode == KICK)
     {
       // move
-      physic.apply(base.x, base.y);
+      physic.apply(frame_ratio, base.x, base.y);
       if (dying != DYING_FALLING)
         collision_swept_object_map(&old_base,&base);
     }
   else if (mode == HELD)
     { /* FIXME: The pbad object shouldn't know about pplayer objects. */
       /* If we're holding the laptop */
-      dir=tux.dir;
+      dir = tux.dir;
       if(dir==RIGHT)
         {
           base.x = tux.base.x + 16;
@@ -266,10 +288,11 @@ BadGuy::action_laptop()
             base.x -= 24;
           else
             base.x += 24;
+          old_base = base;
 
           mode=KICK;
-          set_texture(img_laptop_flat_left, img_laptop_flat_right, 1);
-          physic.set_velocity((dir == LEFT) ? -8 : 8, -8);
+          set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
+          physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5);
           play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER);
         }
     }
@@ -293,11 +316,11 @@ BadGuy::action_laptop()
   /* Handle mode timer: */
   if (mode == FLAT)
     {
-      if(!timer_check(&timer))
+      if(!timer.check())
         {
           mode = NORMAL;
-          set_texture(img_laptop_left, img_laptop_right, 4, 5);
-          physic.set_velocity( (dir == LEFT) ? -1.3 : 1.3, 0);
+          set_sprite(img_laptop_left, img_laptop_right, 4, 5);
+          physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0);
         }
     }
 }
@@ -357,10 +380,23 @@ BadGuy::fall()
           if (physic.get_velocity_y() < 0)
             {
               base.y = int((base.y + base.height)/32) * 32 - base.height;
-              physic.set_velocity(physic.get_velocity_x(), 0);
+              physic.set_velocity_y(0);
             }
           // no gravity anymore please
           physic.enable_gravity(false);
+
+          if (stay_on_platform && mode == NORMAL)
+            {
+              if (!issolid(base.x + ((dir == LEFT) ? 0 : base.width),
+                           base.y + base.height))
+                {
+                  physic.set_velocity_x(-physic.get_velocity_x());
+                  if (dir == LEFT)
+                    dir = RIGHT;
+                  else
+                    dir = LEFT;
+                }
+            }
         }
     }
   else
@@ -372,32 +408,41 @@ BadGuy::fall()
 void
 BadGuy::remove_me()
 {
-  std::vector<BadGuy>::iterator i;
-  for(i = bad_guys.begin(); i != bad_guys.end(); ++i) {
-    if( & (*i) == this) {
-      bad_guys.erase(i);
-      return;
+  for(std::vector<BadGuy>::iterator i = World::current()->bad_guys.begin(); 
+      i != World::current()->bad_guys.end(); ++i) 
+    {
+      if( & (*i) == this) {
+        World::current()->bad_guys.erase(i);
+        return;
+      }
     }
-  }
 }
 
 void
-BadGuy::action_money()
+BadGuy::action_money(float frame_ratio)
 {
+  if (fabsf(physic.get_velocity_y()) < 2.5f)
+    set_sprite(img_jumpy_left_middle, img_jumpy_left_middle, 1);
+  else if (physic.get_velocity_y() < 0)
+    set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1);
+  else 
+    set_sprite(img_jumpy_left_down, img_jumpy_left_down, 1);
+
+  Player& tux = *World::current()->get_tux();
+
   static const float JUMPV = 6;
     
   fall();
   // jump when on ground
   if(dying == DYING_NOT && issolid(base.x, base.y+32))
     {
-      physic.set_velocity(physic.get_velocity_x(), JUMPV);
+      physic.set_velocity_y(JUMPV);
       physic.enable_gravity(true);
-      set_texture(&img_money_left[1], &img_money_right[1], 1);
+
       mode = MONEY_JUMP;
     }
   else if(mode == MONEY_JUMP)
     {
-      set_texture(&img_money_left[0], &img_money_right[0], 1);
       mode = NORMAL;
     }
 
@@ -408,26 +453,26 @@ BadGuy::action_money()
     dir = LEFT;
 
   // move
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if(dying == DYING_NOT)
     collision_swept_object_map(&old_base, &base);
 }
 
 void
-BadGuy::action_mrbomb()
+BadGuy::action_mrbomb(float frame_ratio)
 {
   if (dying == DYING_NOT)
     check_horizontal_bump(true);
 
   fall();
 
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base); 
 }
 
 void
-BadGuy::action_bomb()
+BadGuy::action_bomb(float frame_ratio)
 {
   static const int TICKINGTIME = 1000;
   static const int EXPLODETIME = 1000;
@@ -436,13 +481,13 @@ BadGuy::action_bomb()
 
   if(mode == NORMAL) {
     mode = BOMB_TICKING;
-    timer_start(&timer, TICKINGTIME);
-  } else if(!timer_check(&timer)) {
+    timer.start(TICKINGTIME);
+  } else if(!timer.check()) {
     if(mode == BOMB_TICKING) {
       mode = BOMB_EXPLODE;
-      set_texture(img_mrbomb_explosion, img_mrbomb_explosion, 1);
+      set_sprite(img_mrbomb_explosion, img_mrbomb_explosion, 1);
       dying = DYING_NOT; // now the bomb hurts
-      timer_start(&timer, EXPLODETIME);
+      timer.start(EXPLODETIME);
     } else if(mode == BOMB_EXPLODE) {
       remove_me();
       return;
@@ -450,13 +495,15 @@ BadGuy::action_bomb()
   }
 
   // move
-  physic.apply(base.x, base.y);                 
+  physic.apply(frame_ratio, base.x, base.y);                 
   collision_swept_object_map(&old_base,&base);
 }
 
 void
-BadGuy::action_stalactite()
+BadGuy::action_stalactite(float frame_ratio)
 {
+  Player& tux = *World::current()->get_tux();
+
   static const int SHAKETIME = 800;
   static const int RANGE = 40;
     
@@ -465,12 +512,12 @@ BadGuy::action_stalactite()
     // near
     if(tux.base.x + 32 > base.x - RANGE && tux.base.x < base.x + 32 + RANGE
             && tux.base.y + tux.base.height > base.y) {
-      timer_start(&timer, SHAKETIME);
+      timer.start(SHAKETIME);
       mode = STALACTITE_SHAKING;
     }
   } if(mode == STALACTITE_SHAKING) {
     base.x = old_base.x + (rand() % 6) - 3; // TODO this could be done nicer...
-    if(!timer_check(&timer)) {
+    if(!timer.check()) {
       mode = STALACTITE_FALL;
     }
   } else if(mode == STALACTITE_FALL) {
@@ -478,24 +525,24 @@ BadGuy::action_stalactite()
     /* Destroy if we collides with land */
     if(issolid(base.x+base.width/2, base.y+base.height))
     {
-      timer_start(&timer, 2000);
+      timer.start(2000);
       dying = DYING_SQUISHED;
       mode = FLAT;
-      set_texture(img_stalactite_broken, img_stalactite_broken, 1);
+      set_sprite(img_stalactite_broken, img_stalactite_broken, 1);
     }
   } else if(mode == FLAT) {
     fall();
   }
 
   // move
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
 
-  if(dying == DYING_SQUISHED && !timer_check(&timer))
+  if(dying == DYING_SQUISHED && !timer.check())
     remove_me();
 }
 
 void
-BadGuy::action_flame()
+BadGuy::action_flame(float frame_ratio)
 {
     static const float radius = 100;
     static const float speed = 0.02;
@@ -506,7 +553,7 @@ BadGuy::action_flame()
 }
 
 void
-BadGuy::action_fish()
+BadGuy::action_fish(float frame_ratio)
 {
   static const float JUMPV = 6;
   static const int WAITTIME = 1000;
@@ -516,28 +563,31 @@ BadGuy::action_fish()
         && physic.get_velocity_y() <= 0 && mode == NORMAL)
     {
       mode = FISH_WAIT;
-      set_texture(0, 0);
+      set_sprite(0, 0);
       physic.set_velocity(0, 0);
       physic.enable_gravity(false);
-      timer_start(&timer, WAITTIME);
+      timer.start(WAITTIME);
     }
-  else if(mode == FISH_WAIT && !timer_check(&timer))
+  else if(mode == FISH_WAIT && !timer.check())
     {
       // jump again
-      set_texture(img_fish, img_fish, 2, 1.5);
+      set_sprite(img_fish, img_fish, 2, 2);
       animation_offset = global_frame_counter; // restart animation
       mode = NORMAL;
       physic.set_velocity(0, JUMPV);
       physic.enable_gravity(true);
     }
 
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if(dying == DYING_NOT)
     collision_swept_object_map(&old_base, &base);
+
+  if(physic.get_velocity_y() < 0)
+    set_sprite(img_fish_down, img_fish_down);
 }
 
 void
-BadGuy::action_bouncingsnowball()
+BadGuy::action_bouncingsnowball(float frame_ratio)
 {
   static const float JUMPV = 4.5;
     
@@ -546,7 +596,7 @@ BadGuy::action_bouncingsnowball()
   // jump when on ground
   if(dying == DYING_NOT && issolid(base.x, base.y+32))
     {
-      physic.set_velocity(physic.get_velocity_x(), JUMPV);
+      physic.set_velocity_y(JUMPV);
       physic.enable_gravity(true);
     }                                                     
   else
@@ -557,12 +607,12 @@ BadGuy::action_bouncingsnowball()
   // check for right/left collisions
   check_horizontal_bump();
 
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if(dying == DYING_NOT)
     collision_swept_object_map(&old_base, &base);
 
   // Handle dying timer:
-  if (dying == DYING_SQUISHED && !timer_check(&timer))       
+  if (dying == DYING_SQUISHED && !timer.check())
     {
       /* Remove it if time's up: */
       remove_me();
@@ -571,7 +621,7 @@ BadGuy::action_bouncingsnowball()
 }
 
 void
-BadGuy::action_flyingsnowball()
+BadGuy::action_flyingsnowball(float frame_ratio)
 {
   static const float FLYINGSPEED = 1;
   static const int DIRCHANGETIME = 1000;
@@ -579,30 +629,30 @@ BadGuy::action_flyingsnowball()
   // go into flyup mode if none specified yet
   if(dying == DYING_NOT && mode == NORMAL) {
     mode = FLY_UP;
-    physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED);
-    timer_start(&timer, DIRCHANGETIME/2);
+    physic.set_velocity_y(FLYINGSPEED);
+    timer.start(DIRCHANGETIME/2);
   }
 
-  if(dying == DYING_NOT && !timer_check(&timer)) {
+  if(dying == DYING_NOT && !timer.check()) {
     if(mode == FLY_UP) {
       mode = FLY_DOWN;
-      physic.set_velocity(physic.get_velocity_x(), -FLYINGSPEED);
+      physic.set_velocity_y(-FLYINGSPEED);
     } else if(mode == FLY_DOWN) {
       mode = FLY_UP;
-      physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED);
+      physic.set_velocity_y(FLYINGSPEED);
     }
-    timer_start(&timer, DIRCHANGETIME);
+    timer.start(DIRCHANGETIME);
   }
 
   if(dying != DYING_NOT)
     physic.enable_gravity(true);
 
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if(dying == DYING_NOT || dying == DYING_SQUISHED)
     collision_swept_object_map(&old_base, &base);
 
   // Handle dying timer:
-  if (dying == DYING_SQUISHED && !timer_check(&timer))       
+  if (dying == DYING_SQUISHED && !timer.check())
     {
       /* Remove it if time's up: */
       remove_me();
@@ -611,7 +661,7 @@ BadGuy::action_flyingsnowball()
 }
 
 void
-BadGuy::action_spiky()
+BadGuy::action_spiky(float frame_ratio)
 {
   if (dying == DYING_NOT)
     check_horizontal_bump();
@@ -622,30 +672,30 @@ BadGuy::action_spiky()
   if (physic.get_velocity_y() == 0 && 
           !issolid(base.x+base.width/2, base.y + base.height)) {
     physic.enable_gravity(true);
-    physic.set_velocity(physic.get_velocity_x(), 2);
+    physic.set_velocity_y(2);
   }
 #endif
 
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base);   
 }
 
 void
-BadGuy::action_snowball()
+BadGuy::action_snowball(float frame_ratio)
 {
   if (dying == DYING_NOT)
     check_horizontal_bump();
 
   fall();
 
-  physic.apply(base.x, base.y);
+  physic.apply(frame_ratio, base.x, base.y);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base);
 }
 
 void
-BadGuy::action()
+BadGuy::action(float frame_ratio)
 {
   // Remove if it's far off the screen:
   if (base.x < scroll_x - OFFSCREEN_DISTANCE)
@@ -670,51 +720,51 @@ BadGuy::action()
   switch (kind)
     {
     case BAD_BSOD:
-      action_bsod();
+      action_bsod(frame_ratio);
       break;
 
     case BAD_LAPTOP:
-      action_laptop();
+      action_laptop(frame_ratio);
       break;
   
     case BAD_MONEY:
-      action_money();
+      action_money(frame_ratio);
       break;
 
     case BAD_MRBOMB:
-      action_mrbomb();
+      action_mrbomb(frame_ratio);
       break;
     
     case BAD_BOMB:
-      action_bomb();
+      action_bomb(frame_ratio);
       break;
 
     case BAD_STALACTITE:
-      action_stalactite();
+      action_stalactite(frame_ratio);
       break;
 
     case BAD_FLAME:
-      action_flame();
+      action_flame(frame_ratio);
       break;
 
     case BAD_FISH:
-      action_fish();
+      action_fish(frame_ratio);
       break;
 
     case BAD_BOUNCINGSNOWBALL:
-      action_bouncingsnowball();
+      action_bouncingsnowball(frame_ratio);
       break;
 
     case BAD_FLYINGSNOWBALL:
-      action_flyingsnowball();
+      action_flyingsnowball(frame_ratio);
       break;
 
     case BAD_SPIKY:
-      action_spiky();
+      action_spiky(frame_ratio);
       break;
 
     case BAD_SNOWBALL:
-      action_snowball();
+      action_snowball(frame_ratio);
       break;
     }
 }
@@ -725,41 +775,58 @@ BadGuy::draw()
   // Don't try to draw stuff that is outside of the screen
   if(base.x <= scroll_x - base.width || base.x >= scroll_x + screen->w)
     return;
-  if(texture_left == 0 || texture_right == 0)
-    return;
+  
+  if(sprite_left == 0 || sprite_right == 0)
+    {
+      std::cout << "BadGuy: Error no sprite loaded" << std::endl;
+      return;
+    }
 
   float global_frame = (float(global_frame_counter - animation_offset) / 10);
   global_frame *= animation_speed;
-  size_t frame = size_t(global_frame) % animation_length;
-  texture_type* texture = 
-      (dir == LEFT) ? &texture_left[frame] : &texture_right[frame];
-  texture_draw(texture, base.x - scroll_x, base.y);
+  //size_t frame = size_t(global_frame) % animation_length;
+  Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right;
+  sprite->draw(base.x - scroll_x, base.y);
+
+  if (debug_mode)
+    fillrect(base.x - scroll_x, base.y, base.width, base.height, 75,0,75, 150);
 }
 
 void
-BadGuy::set_texture(texture_type* left, texture_type* right,
-    int nanimlength, float nanimspeed)
+BadGuy::set_sprite(Sprite* left, Sprite* right,
+                   int nanimlength, float nanimspeed)
 {
-  if(left != 0) {
-    if(base.width == 0 && base.height == 0) {
-      base.width = left->w;
-      base.height = left->h;
-    } else if(base.width != left->w || base.height != left->h) {
-      base.x -= (left->w - base.width) / 2;
-      base.y -= left->h - base.height;
-      base.width = left->w;
-      base.height = left->h;
-      old_base = base;
+  if (1)
+    {
+      base.width = 32;
+      base.height = 32;
+    }
+  else
+    {
+      // FIXME: Using the image size for the physics and collision is
+      // a bad idea, since images should always overlap there physical
+      // representation
+      if(left != 0) {
+        if(base.width == 0 && base.height == 0) {
+          base.width  = left->get_width();
+          base.height = left->get_height();
+        } else if(base.width != left->get_width() || base.height != left->get_height()) {
+          base.x -= (left->get_width() - base.width) / 2;
+          base.y -= left->get_height() - base.height;
+          base.width = left->get_width();
+          base.height = left->get_height();
+          old_base = base;
+        }
+      } else {
+        base.width = base.height = 0;
+      }
     }
-  } else {
-    base.width = base.height = 0;
-  }
 
   animation_length = nanimlength;
   animation_speed = nanimspeed;
   animation_offset = 0;
-  texture_left = left;
-  texture_right = right;
+  sprite_left  = left;
+  sprite_right = right;
 }
 
 void
@@ -774,7 +841,7 @@ BadGuy::bump()
 void
 BadGuy::make_player_jump(Player* player)
 {
-  player->physic.set_velocity(player->physic.get_velocity_x(), 2);
+  player->physic.set_velocity_y(2);
   player->base.y = base.y - player->base.height - 2;
 }
 
@@ -783,12 +850,13 @@ BadGuy::squish_me(Player* player)
 {
   make_player_jump(player);
     
-  add_score(base.x - scroll_x, base.y, 50 * score_multiplier);
+  World::current()->add_score(base.x - scroll_x,
+                              base.y, 50 * player_status.score_multiplier);
   play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
-  score_multiplier++;
+  player_status.score_multiplier++;
 
   dying = DYING_SQUISHED;
-  timer_start(&timer, 2000);
+  timer.start(2000);
   physic.set_velocity(0, 0);
 }
 
@@ -796,74 +864,78 @@ void
 BadGuy::squish(Player* player)
 {
   if(kind == BAD_MRBOMB) {
-      // mrbomb transforms into a bomb now
-      add_bad_guy(base.x, base.y, BAD_BOMB);
-      
-      make_player_jump(player);
-      add_score(base.x - scroll_x, base.y, 50 * score_multiplier);
-      play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
-      score_multiplier++;
+    // mrbomb transforms into a bomb now
+    World::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
+    
+    make_player_jump(player);
+    World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier);
+    play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
+    player_status.score_multiplier++;
       
-      remove_me();
-      return;
+    remove_me();
+    return;
 
   } else if(kind == BAD_BSOD) {
-      squish_me(player);
-      set_texture(img_bsod_squished_left, img_bsod_squished_right, 1);
-      physic.set_velocity(0, physic.get_velocity_y());
-      return;
+    squish_me(player);
+    set_sprite(img_bsod_squished_left, img_bsod_squished_right, 1);
+    physic.set_velocity_x(0);
+    return;
       
   } else if (kind == BAD_LAPTOP) {
-      if (mode == NORMAL || mode == KICK)
+    if (mode == NORMAL || mode == KICK)
       {
-          /* Flatten! */
-          play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
-          mode = FLAT;
-          set_texture(img_laptop_flat_left, img_laptop_flat_right, 1);
-          physic.set_velocity(0, physic.get_velocity_y());
+        /* Flatten! */
+        play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
+        mode = FLAT;
+        set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
+        physic.set_velocity_x(0);
 
-          timer_start(&timer, 4000);
+        timer.start(4000);
       } else if (mode == FLAT) {
-          /* Kick! */
-          play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
-
-          if (player->base.x < base.x + (base.width/2)) {
-              physic.set_velocity(5, physic.get_velocity_y());
-              dir = RIGHT;
-          } else {
-              physic.set_velocity(-5, physic.get_velocity_y());
-              dir = LEFT;
-          }
-
-          mode = KICK;
-          set_texture(img_laptop_flat_left, img_laptop_flat_right, 1);
+        /* Kick! */
+        play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
+
+        if (player->base.x < base.x + (base.width/2)) {
+          physic.set_velocity_x(5);
+          dir = RIGHT;
+        } else {
+          physic.set_velocity_x(-5);
+          dir = LEFT;
+        }
+
+        mode = KICK;
+        set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
       }
 
-      make_player_jump(player);
+    make_player_jump(player);
 	      
-      add_score(base.x - scroll_x, base.y, 25 * score_multiplier);
-      score_multiplier++;
-      return;
+    World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
+    player_status.score_multiplier++;
+    return;
   } else if(kind == BAD_FISH) {
+    // fish can only be killed when falling down
+    if(physic.get_velocity_y() >= 0)
+      return;
+      
     make_player_jump(player);
 	      
-    add_score(base.x - scroll_x, base.y, 25 * score_multiplier);
-    score_multiplier++;
+    World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
+    player_status.score_multiplier++;
      
     // simply remove the fish...
     remove_me();
     return;
   } else if(kind == BAD_BOUNCINGSNOWBALL) {
     squish_me(player);
-    set_texture(img_bouncingsnowball_squished,img_bouncingsnowball_squished,1);
+    set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished,1);
     return;
   } else if(kind == BAD_FLYINGSNOWBALL) {
     squish_me(player);
-    set_texture(img_flyingsnowball_squished,img_flyingsnowball_squished,1);
+    set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished,1);
     return;
   } else if(kind == BAD_SNOWBALL) {
     squish_me(player);
-    set_texture(img_snowball_squished_left, img_snowball_squished_right, 1);
+    set_sprite(img_snowball_squished_left, img_snowball_squished_right, 1);
     return;
   }
 }
@@ -876,20 +948,20 @@ BadGuy::kill_me()
 
   dying = DYING_FALLING;
   if(kind == BAD_LAPTOP)
-    set_texture(img_laptop_falling_left, img_laptop_falling_right, 1);
+    set_sprite(img_laptop_falling_left, img_laptop_falling_right, 1);
   else if(kind == BAD_BSOD)
-    set_texture(img_bsod_falling_left, img_bsod_falling_right, 1);
+    set_sprite(img_bsod_falling_left, img_bsod_falling_right, 1);
   
   physic.enable_gravity(true);
-  physic.set_velocity(physic.get_velocity_x(), 0);
+  physic.set_velocity_y(0);
 
   /* Gain some points: */
   if (kind == BAD_BSOD)
-    add_score(base.x - scroll_x, base.y,
-              50 * score_multiplier);
+    World::current()->add_score(base.x - scroll_x, base.y,
+                    50 * player_status.score_multiplier);
   else 
-    add_score(base.x - scroll_x, base.y,                                 
-              25 * score_multiplier);
+    World::current()->add_score(base.x - scroll_x, base.y,                                 
+                    25 * player_status.score_multiplier);
 
   /* Play death sound: */
   play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
@@ -910,6 +982,7 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
     return;
   }
 
+  /* COLLISION_NORMAL */
   switch (c_object)
     {
     case CO_BULLET:
@@ -918,15 +991,73 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
 
     case CO_BADGUY:
       pbad_c = (BadGuy*) p_c_object;
+
+      /* If we're a kicked mriceblock, kill any badguys we hit */
       if(kind == BAD_LAPTOP && mode == KICK &&
             pbad_c->kind != BAD_FLAME && pbad_c->kind != BAD_BOMB)
         {
-          /* We're in kick mode, kill the other guy
-	     and yourself(wuahaha) : */
           pbad_c->kill_me();
-          kill_me();
         }
+
+      /* Kill badguys that run into exploding bomb */
+      else if (kind == BAD_BOMB && dying == DYING_NOT)
+      {
+        if (pbad_c->kind == BAD_MRBOMB)
+        {
+          // FIXME: this is where other MrBombs *should* explode istead of dying
+          pbad_c->kill_me(); 
+        }
+        else if (pbad_c->kind != BAD_BOMB)
+        {
+          pbad_c->kill_me();
+        }
+      }
+
+      /* Kill any badguys that get hit by stalactite */
+      else if (kind == BAD_STALACTITE && dying == DYING_NOT)
+      {
+        pbad_c->kill_me();
+      }
+
+      /* When enemies run into eachother, make them change directions */
+      else
+      {
+        // Jumpy is an exception
+        if (pbad_c->kind == BAD_MONEY)
+          break;
+        if (dir == LEFT)
+          dir = RIGHT;
+        else if (dir == RIGHT)
+          dir = LEFT;
+
+        physic.inverse_velocity_x();
+      }
+      
+      break;
+
+    case CO_PLAYER:
+      Player* player = static_cast<Player*>(p_c_object);
+      /* Get kicked if were flat */
+      if (mode == FLAT && !dying)
+      {
+        play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
+
+        // Hit from left side
+        if (player->base.x < base.x) {
+          physic.set_velocity_x(5);
+          dir = RIGHT;
+        }
+        // Hit from right side
+        else {
+          physic.set_velocity_x(-5);
+          dir = LEFT;
+        }
+
+        mode = KICK;
+        set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
+      }
       break;
+
     }
 }
 
@@ -934,258 +1065,221 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
 
 void load_badguy_gfx()
 {
+  img_bsod_squished_left = sprite_manager->load("bsod-squished-left");
+  img_bsod_squished_right = sprite_manager->load("bsod-squished-right");
+  img_bsod_falling_left = sprite_manager->load("bsod-falling-left");
+  img_bsod_falling_right = sprite_manager->load("bsod-falling-right");
+  img_laptop_flat_left = sprite_manager->load("laptop-flat-left");
+  img_laptop_flat_right = sprite_manager->load("laptop-flat-right");
+  img_laptop_falling_left = sprite_manager->load("laptop-falling-left");
+  img_laptop_falling_right = sprite_manager->load("laptop-falling-right");
+  img_bsod_left = sprite_manager->load("bsod-left");
+  img_bsod_right = sprite_manager->load("bsod-right");
+  img_laptop_left = sprite_manager->load("laptop-left");
+  img_laptop_right = sprite_manager->load("laptop-right");
+  img_jumpy_left_up = sprite_manager->load("jumpy-left-up");
+  img_jumpy_left_down = sprite_manager->load("jumpy-left-down");
+  img_jumpy_left_middle = sprite_manager->load("jumpy-left-middle");
+  img_mrbomb_left = sprite_manager->load("mrbomb-left");
+  img_mrbomb_right = sprite_manager->load("mrbomb-right");
+  img_mrbomb_ticking_left = sprite_manager->load("mrbomb-ticking-left");
+  img_mrbomb_ticking_right = sprite_manager->load("mrbomb-ticking-right");
+  img_mrbomb_explosion = sprite_manager->load("mrbomb-explosion");
+  img_stalactite = sprite_manager->load("stalactite");
+  img_stalactite_broken = sprite_manager->load("stalactite-broken");
+  img_flame = sprite_manager->load("flame");
+  img_fish = sprite_manager->load("fish");
+  img_fish_down = sprite_manager->load("fish-down");
+  img_bouncingsnowball_left = sprite_manager->load("bouncingsnowball-left");
+  img_bouncingsnowball_right = sprite_manager->load("bouncingsnowball-right");
+  img_bouncingsnowball_squished = sprite_manager->load("bouncingsnowball-squished");
+  img_flyingsnowball = sprite_manager->load("flyingsnowball");
+  img_flyingsnowball_squished = sprite_manager->load("flyingsnowball-squished");
+  img_spiky_left = sprite_manager->load("spiky-left");
+  img_spiky_right = sprite_manager->load("spiky-right");
+  img_snowball_left = sprite_manager->load("snowball-left");
+  img_snowball_right = sprite_manager->load("snowball-right");
+  img_snowball_squished_left = sprite_manager->load("snowball-squished-left");
+  img_snowball_squished_right = sprite_manager->load("snowball-squished-right");
+#if 0
   /* (BSOD) */
-  texture_load(&img_bsod_left[0], datadir +
-               "/images/shared/bsod-left-0.png",
-               USE_ALPHA);
+  img_bsod_left[0] = new Surface(datadir + "/images/shared/bsod-left-0.png", USE_ALPHA);
 
-  texture_load(&img_bsod_left[1], datadir +
-               "/images/shared/bsod-left-1.png",
-               USE_ALPHA);
+  img_bsod_left[1] = new Surface(datadir +
+                                 "/images/shared/bsod-left-1.png",
+                                 USE_ALPHA);
 
-  texture_load(&img_bsod_left[2], datadir +
-               "/images/shared/bsod-left-2.png",
-               USE_ALPHA);
+  img_bsod_left[2] = new Surface(datadir +
+                                 "/images/shared/bsod-left-2.png",
+                                 USE_ALPHA);
 
-  texture_load(&img_bsod_left[3], datadir +
-               "/images/shared/bsod-left-3.png",
-               USE_ALPHA);
+  img_bsod_left[3] = new Surface(datadir +
+                                 "/images/shared/bsod-left-3.png",
+                                 USE_ALPHA);
 
-  texture_load(&img_bsod_right[0], datadir +
-               "/images/shared/bsod-right-0.png",
-               USE_ALPHA);
+  img_bsod_right[0] = new Surface(datadir +
+                                  "/images/shared/bsod-right-0.png",
+                                  USE_ALPHA);
 
-  texture_load(&img_bsod_right[1], datadir +
-               "/images/shared/bsod-right-1.png",
-               USE_ALPHA);
+  img_bsod_right[1] = new Surface(datadir +
+                                  "/images/shared/bsod-right-1.png",
+                                  USE_ALPHA);
 
-  texture_load(&img_bsod_right[2], datadir +
-               "/images/shared/bsod-right-2.png",
-               USE_ALPHA);
+  img_bsod_right[2] = new Surface(datadir +
+                                  "/images/shared/bsod-right-2.png",
+                                  USE_ALPHA);
 
-  texture_load(&img_bsod_right[3], datadir +
-               "/images/shared/bsod-right-3.png",
-               USE_ALPHA);
+  img_bsod_right[3] = new Surface(datadir +
+                                  "/images/shared/bsod-right-3.png",
+                                  USE_ALPHA);
 
-  texture_load(&img_bsod_squished_left[0], datadir +
-               "/images/shared/bsod-squished-left.png",
-               USE_ALPHA);
+  img_bsod_squished_left[0] = new Surface(datadir +
+                                          "/images/shared/bsod-squished-left.png",
+                                          USE_ALPHA);
 
-  texture_load(&img_bsod_squished_right[0], datadir +
-               "/images/shared/bsod-squished-right.png",
-               USE_ALPHA);
+  img_bsod_squished_right[0] = new Surface(datadir +
+                                           "/images/shared/bsod-squished-right.png",
+                                           USE_ALPHA);
 
-  texture_load(&img_bsod_falling_left[0], datadir +
-               "/images/shared/bsod-falling-left.png",
-               USE_ALPHA);
+  img_bsod_falling_left[0] = new Surface(datadir +
+                                         "/images/shared/bsod-falling-left.png",
+                                         USE_ALPHA);
 
-  texture_load(&img_bsod_falling_right[0], datadir +
-               "/images/shared/bsod-falling-right.png",
-               USE_ALPHA);
+  img_bsod_falling_right[0] = new Surface(datadir +
+                                          "/images/shared/bsod-falling-right.png",
+                                          USE_ALPHA);
 
 
   /* (Laptop) */
 
-  texture_load(&img_laptop_left[0], datadir + "/images/shared/mriceblock-left-0.png", USE_ALPHA);
-  texture_load(&img_laptop_left[1], datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA);
-  texture_load(&img_laptop_left[2], datadir + "/images/shared/mriceblock-left-2.png", USE_ALPHA);
-  texture_load(&img_laptop_left[3], datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA);
+  img_laptop_left[0] = new Surface(datadir + "/images/shared/mriceblock-left-0.png", USE_ALPHA);
+  img_laptop_left[1] = new Surface(datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA);
+  img_laptop_left[2] = new Surface(datadir + "/images/shared/mriceblock-left-2.png", USE_ALPHA);
+  img_laptop_left[3] = new Surface(datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA);
 
-  texture_load(&img_laptop_right[0], datadir + "/images/shared/mriceblock-right-0.png", USE_ALPHA);
-  texture_load(&img_laptop_right[1], datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA);
-  texture_load(&img_laptop_right[2], datadir + "/images/shared/mriceblock-right-2.png", USE_ALPHA);
-  texture_load(&img_laptop_right[3], datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA);
+  img_laptop_right[0] = new Surface(datadir + "/images/shared/mriceblock-right-0.png", USE_ALPHA);
+  img_laptop_right[1] = new Surface(datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA);
+  img_laptop_right[2] = new Surface(datadir + "/images/shared/mriceblock-right-2.png", USE_ALPHA);
+  img_laptop_right[3] = new Surface(datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA);
   
-  texture_load(&img_laptop_flat_left[0], 
-               datadir + "/images/shared/laptop-flat-left.png",
-               USE_ALPHA);
+  img_laptop_flat_left[0] = new Surface(
+                                        datadir + "/images/shared/laptop-flat-left.png",
+                                        USE_ALPHA);
 
-  texture_load(&img_laptop_flat_right[0], datadir +
-               "/images/shared/laptop-flat-right.png",
-               USE_ALPHA);
+  img_laptop_flat_right[0] = new Surface(datadir +
+                                         "/images/shared/laptop-flat-right.png",
+                                         USE_ALPHA);
 
-  texture_load(&img_laptop_falling_left[0], datadir +
-               "/images/shared/laptop-falling-left.png",
-               USE_ALPHA);
+  img_laptop_falling_left[0] = new Surface(datadir +
+                                           "/images/shared/laptop-falling-left.png",
+                                           USE_ALPHA);
 
-  texture_load(&img_laptop_falling_right[0], datadir +
-               "/images/shared/laptop-falling-right.png",
-               USE_ALPHA);
+  img_laptop_falling_right[0] = new Surface(datadir +
+                                            "/images/shared/laptop-falling-right.png",
+                                            USE_ALPHA);
 
 
   /* (Money) */
-
-  texture_load(&img_money_left[0], datadir +
-               "/images/shared/bag-left-0.png",
-               USE_ALPHA);
-
-  texture_load(&img_money_left[1], datadir +
-               "/images/shared/bag-left-1.png",
-               USE_ALPHA);
-
-  texture_load(&img_money_right[0], datadir +
-               "/images/shared/bag-right-0.png",
-               USE_ALPHA);
-
-  texture_load(&img_money_right[1], datadir +
-               "/images/shared/bag-right-1.png",
-               USE_ALPHA);
+  img_jumpy_left_up   = new Surface(datadir +
+                                    "/images/shared/jumpy-left-up-0.png",
+                                    USE_ALPHA);
+  img_jumpy_left_down = new Surface(datadir +
+                                    "/images/shared/jumpy-left-down-0.png",
+                                    USE_ALPHA);
+  img_jumpy_left_middle = new Surface(datadir +
+                                      "/images/shared/jumpy-left-middle-0.png",
+                                      USE_ALPHA);
 
   /* Mr. Bomb */
   for(int i=0; i<4; ++i) {
-      char num[4];
-      snprintf(num, 4, "%d", i);
-      texture_load(&img_mrbomb_left[i],
-              datadir + "/images/shared/mrbomb-left-" + num + ".png", USE_ALPHA);
-      texture_load(&img_mrbomb_right[i],
-              datadir + "/images/shared/mrbomb-right-" + num + ".png", USE_ALPHA);
+    char num[4];
+    snprintf(num, 4, "%d", i);
+    img_mrbomb_left[i] = new Surface(
+                                     datadir + "/images/shared/mrbomb-left-" + num + ".png", USE_ALPHA);
+    img_mrbomb_right[i] = new Surface(
+                                      datadir + "/images/shared/mrbomb-right-" + num + ".png", USE_ALPHA);
   }
-  texture_load(&img_mrbomb_ticking_left[0],
-          datadir + "/images/shared/mrbombx-left-0.png", USE_ALPHA);
-  texture_load(&img_mrbomb_ticking_right[0],
-          datadir + "/images/shared/mrbombx-right-0.png", USE_ALPHA);
-  texture_load(&img_mrbomb_explosion[0],
-          datadir + "/images/shared/mrbomb-explosion.png", USE_ALPHA);
+  img_mrbomb_ticking_left[0] = new Surface(
+                                           datadir + "/images/shared/mrbombx-left-0.png", USE_ALPHA);
+  img_mrbomb_ticking_right[0] = new Surface(
+                                            datadir + "/images/shared/mrbombx-right-0.png", USE_ALPHA);
+  img_mrbomb_explosion[0] = new Surface(
+                                        datadir + "/images/shared/mrbomb-explosion.png", USE_ALPHA);
 
   /* stalactite */
-  texture_load(&img_stalactite[0], 
-          datadir + "/images/shared/stalactite.png", USE_ALPHA);
-  texture_load(&img_stalactite_broken[0],
-          datadir + "/images/shared/stalactite-broken.png", USE_ALPHA);
+  img_stalactite[0] = new Surface(
+                                  datadir + "/images/shared/stalactite.png", USE_ALPHA);
+  img_stalactite_broken[0] = new Surface(
+                                         datadir + "/images/shared/stalactite-broken.png", USE_ALPHA);
 
   /* flame */
-  texture_load(&img_flame[0],
-          datadir + "/images/shared/flame-0.png", USE_ALPHA);
-  texture_load(&img_flame[1],
-          datadir + "/images/shared/flame-1.png", USE_ALPHA);  
+  img_flame[0] = new Surface(
+                             datadir + "/images/shared/flame-0.png", USE_ALPHA);
+  img_flame[1] = new Surface(
+                             datadir + "/images/shared/flame-1.png", USE_ALPHA);  
 
   /* fish */
-  texture_load(&img_fish[0],
-          datadir + "/images/shared/fish-left-0.png", USE_ALPHA);
-  texture_load(&img_fish[1],
-          datadir + "/images/shared/fish-left-1.png", USE_ALPHA);
+  img_fish[0] = new Surface(
+                            datadir + "/images/shared/fish-left-0.png", USE_ALPHA);
+  img_fish[1] = new Surface(
+                            datadir + "/images/shared/fish-left-1.png", USE_ALPHA);
+  img_fish_down[0] = new Surface(
+                                 datadir + "/images/shared/fish-down-0.png", USE_ALPHA);
 
   /* bouncing snowball */
   for(int i=0; i<6; ++i) {
-      char num[4];
-      snprintf(num, 4, "%d", i);
-      texture_load(&img_bouncingsnowball_left[i],
-              datadir + "/images/shared/bouncingsnowball-left-" + num + ".png",
-              USE_ALPHA);
-      texture_load(&img_bouncingsnowball_right[i],
-              datadir + "/images/shared/bouncingsnowball-right-" + num + ".png",
-              USE_ALPHA);
+    char num[4];
+    snprintf(num, 4, "%d", i);
+    img_bouncingsnowball_left[i] = new Surface(
+                                               datadir + "/images/shared/bouncingsnowball-left-" + num + ".png",
+                                               USE_ALPHA);
+    img_bouncingsnowball_right[i] = new Surface(
+                                                datadir + "/images/shared/bouncingsnowball-right-" + num + ".png",
+                                                USE_ALPHA);
   } 
-  texture_load(&img_bouncingsnowball_squished[0],
-          datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA);
+  img_bouncingsnowball_squished[0] = new Surface(
+                                                 datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA);
 
   /* flying snowball */
-  texture_load(&img_flyingsnowball[0],
-          datadir + "/images/shared/flyingsnowball-left-0.png", USE_ALPHA);
-  texture_load(&img_flyingsnowball[1],
-          datadir + "/images/shared/flyingsnowball-left-1.png", USE_ALPHA);  
-  texture_load(&img_flyingsnowball_squished[0],
-          datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA);
+  img_flyingsnowball[0] = new Surface(
+                                      datadir + "/images/shared/flyingsnowball-left-0.png", USE_ALPHA);
+  img_flyingsnowball[1] = new Surface(
+                                      datadir + "/images/shared/flyingsnowball-left-1.png", USE_ALPHA);  
+  img_flyingsnowball_squished[0] = new Surface(
+                                               datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA);
 
   /* spiky */
   for(int i = 0; i < 3; ++i) {
-        char num[4];
-        snprintf(num, 4, "%d", i);
-        texture_load(&img_spiky_left[i],                                 
-                datadir + "/images/shared/spiky-left-" + num + ".png",   
-                USE_ALPHA);
-        texture_load(&img_spiky_right[i],
-                datadir + "/images/shared/spiky-right-" + num + ".png",
-                USE_ALPHA);
+    char num[4];
+    snprintf(num, 4, "%d", i);
+    img_spiky_left[i] = new Surface(                                
+                                    datadir + "/images/shared/spiky-left-" + num + ".png",   
+                                    USE_ALPHA);
+    img_spiky_right[i] = new Surface(
+                                     datadir + "/images/shared/spiky-right-" + num + ".png",
+                                     USE_ALPHA);
   }
 
   /** snowball */
-  texture_load(&img_snowball_left[0], datadir + "/images/shared/snowball-left-0.png", USE_ALPHA);
-  texture_load(&img_snowball_left[1], datadir + "/images/shared/snowball-left-1.png", USE_ALPHA);
-  texture_load(&img_snowball_left[2], datadir + "/images/shared/snowball-left-2.png", USE_ALPHA);
-  texture_load(&img_snowball_left[3], datadir + "/images/shared/snowball-left-1.png", USE_ALPHA);
-
-  texture_load(&img_snowball_right[0], datadir + "/images/shared/snowball-right-0.png", USE_ALPHA);
-  texture_load(&img_snowball_right[1], datadir + "/images/shared/snowball-right-1.png", USE_ALPHA);
-  texture_load(&img_snowball_right[2], datadir + "/images/shared/snowball-right-2.png", USE_ALPHA);
-  texture_load(&img_snowball_right[3], datadir + "/images/shared/snowball-right-1.png", USE_ALPHA);
-
-  texture_load(&img_snowball_squished_left[0],
-          datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA);
-  texture_load(&img_snowball_squished_right[0],
-          datadir + "/images/shared/bsod-squished-right.png", USE_ALPHA);  
+  img_snowball_left[0] = new Surface(datadir + "/images/shared/snowball-left-0.png", USE_ALPHA);
+  img_snowball_left[1] = new Surface(datadir + "/images/shared/snowball-left-1.png", USE_ALPHA);
+  img_snowball_left[2] = new Surface(datadir + "/images/shared/snowball-left-2.png", USE_ALPHA);
+  img_snowball_left[3] = new Surface(datadir + "/images/shared/snowball-left-1.png", USE_ALPHA);
+
+  img_snowball_right[0] = new Surface(datadir + "/images/shared/snowball-right-0.png", USE_ALPHA);
+  img_snowball_right[1] = new Surface(datadir + "/images/shared/snowball-right-1.png", USE_ALPHA);
+  img_snowball_right[2] = new Surface(datadir + "/images/shared/snowball-right-2.png", USE_ALPHA);
+  img_snowball_right[3] = new Surface(datadir + "/images/shared/snowball-right-1.png", USE_ALPHA);
+
+  img_snowball_squished_left[0] = new Surface(
+                                              datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA);
+  img_snowball_squished_right[0] = new Surface(
+                                               datadir + "/images/shared/bsod-squished-right.png", USE_ALPHA);  
+#endif
 }
 
 void free_badguy_gfx()
 {
-  for (int i = 0; i < 4; i++)
-    {
-      texture_free(&img_bsod_left[i]);
-      texture_free(&img_bsod_right[i]);
-    }
-
-  texture_free(&img_bsod_squished_left[0]);
-  texture_free(&img_bsod_squished_right[0]);
-
-  texture_free(&img_bsod_falling_left[0]);
-  texture_free(&img_bsod_falling_right[0]);
-
-  for (int i = 0; i < 4; i++)
-    {
-      texture_free(&img_laptop_left[i]);
-      texture_free(&img_laptop_right[i]);
-    }
-
-  texture_free(&img_laptop_flat_left[0]);
-  texture_free(&img_laptop_flat_right[0]);
-
-  texture_free(&img_laptop_falling_left[0]);
-  texture_free(&img_laptop_falling_right[0]);
-
-  for (int i = 0; i < 2; i++)
-    {
-      texture_free(&img_money_left[i]);
-      texture_free(&img_money_right[i]);
-    }
-
-  for(int i = 0; i < 4; i++) {
-      texture_free(&img_mrbomb_left[i]);
-      texture_free(&img_mrbomb_right[i]);
-  }
-
-  texture_free(&img_mrbomb_ticking_left[0]);
-  texture_free(&img_mrbomb_ticking_right[0]);
-  texture_free(&img_mrbomb_explosion[0]);
-
-  texture_free(&img_stalactite[0]);
-  texture_free(&img_stalactite_broken[0]);
-
-  texture_free(&img_flame[0]);
-  texture_free(&img_flame[1]);
-
-  texture_free(&img_fish[0]);
-  texture_free(&img_fish[1]);
-
-  for(int i=0; i<6; ++i) {
-    texture_free(&img_bouncingsnowball_left[i]);
-    texture_free(&img_bouncingsnowball_right[i]);
-  }
-  texture_free(&img_bouncingsnowball_squished[0]);
-
-  texture_free(&img_flyingsnowball[0]);
-  texture_free(&img_flyingsnowball[1]);
-  texture_free(&img_flyingsnowball_squished[0]);
-
-  for(int i = 0; i<3; ++i) {
-    texture_free(&img_spiky_left[i]);
-    texture_free(&img_spiky_right[i]);
-  }
-  for(int i = 0; i<4; ++i) {
-    texture_free(&img_snowball_left[i]);
-    texture_free(&img_snowball_right[i]);
-  }
-  texture_free(&img_snowball_squished_left[0]);
-  texture_free(&img_snowball_squished_right[0]); 
 }
 
 // EOF //