moved some sprites to separate files

[supertux.git] / src / badguy / mriceblock.cpp

diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index b255576..0525848 100644 (file)
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -20,8 +20,8 @@
 
 #include <config.h>
 
-#include "mriceblock.h"
-#include "object/block.h"
+#include "mriceblock.hpp"
+#include "object/block.hpp"
 
 static const float WALKSPEED = 80;
 static const float KICKSPEED = 500;
@@ -68,14 +68,14 @@ MrIceBlock::activate()
 }
 
 void
-MrIceBlock::active_action(float elapsed_time)
+MrIceBlock::active_update(float elapsed_time)
 {
   if(ice_state == ICESTATE_FLAT && flat_timer.check()) {
     ice_state = ICESTATE_NORMAL;
     physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
     sprite->set_action(dir == LEFT ? "left" : "right");
   }
-  BadGuy::active_action(elapsed_time);
+  BadGuy::active_update(elapsed_time);
 }
 
 HitResponse
@@ -105,8 +105,7 @@ MrIceBlock::collision_solid(GameObject& object, const CollisionHit& hit)
       dir = dir == LEFT ? RIGHT : LEFT;
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
       physic.set_velocity_x(-physic.get_velocity_x());
-      sound_manager->play_sound("ricochet", get_pos(),
-                                Sector::current()->player->get_pos());
+      sound_manager->play("sounds/iceblock_bump.wav", get_pos());
       break;
     }
     case ICESTATE_FLAT:
@@ -153,7 +152,7 @@ MrIceBlock::collision_squished(Player& player)
       }
 
       // flatten
-      sound_manager->play_sound("stomp", get_pos(), player.get_pos());
+      sound_manager->play("sounds/stomp.wav", get_pos());
       physic.set_velocity_x(0);
       physic.set_velocity_y(0); 
       
@@ -163,7 +162,7 @@ MrIceBlock::collision_squished(Player& player)
       break;
     case ICESTATE_FLAT:
       // kick
-      sound_manager->play_sound("kick", this, player.get_pos());
+      sound_manager->play("sounds/kick.wav", get_pos());
 
       if(player.get_pos().x < get_pos().x) {
         dir = RIGHT;