Removed some obsolete stuff from supertux/globals.hpp

[supertux.git] / src / object / invisible_block.cpp

diff --git a/src/object/invisible_block.cpp b/src/object/invisible_block.cpp
index 7554351..3f4a8c5 100644 (file)
--- a/src/object/invisible_block.cpp
+++ b/src/object/invisible_block.cpp
@@ -22,11 +22,11 @@
 #include "supertux/constants.hpp"
 
 InvisibleBlock::InvisibleBlock(const Vector& pos) :
-   Block(sprite_manager->create("images/objects/bonus_block/invisibleblock.sprite")), 
+   Block(SpriteManager::current()->create("images/objects/bonus_block/invisibleblock.sprite")),
    visible(false)
 {
   bbox.set_pos(pos);
-  sound_manager->preload("sounds/brick.wav");
+  SoundManager::current()->preload("sounds/brick.wav");
 }
 
 void
@@ -44,7 +44,7 @@ InvisibleBlock::collides(GameObject& other, const CollisionHit& )
 
   // if we're not visible, only register a collision if this will make us visible
   Player* player = dynamic_cast<Player*> (&other);
-  if ((player) 
+  if ((player)
       && (player->get_movement().y <= 0)
       && (player->get_bbox().get_top() > get_bbox().get_bottom() - SHIFT_DELTA)) {
     return true;
@@ -54,15 +54,15 @@ InvisibleBlock::collides(GameObject& other, const CollisionHit& )
 }
 
 HitResponse
-InvisibleBlock::collision(GameObject& other, const CollisionHit& hit)
+InvisibleBlock::collision(GameObject& other, const CollisionHit& hit_)
 {
-  return Block::collision(other, hit);
+  return Block::collision(other, hit_);
 }
 
 void
 InvisibleBlock::hit(Player& player)
 {
-  sound_manager->play("sounds/brick.wav");
+  SoundManager::current()->play("sounds/brick.wav");
 
   if(visible)
     return;