[cppcheck] Part 1: Performance

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

diff --git a/src/badguy/totem.cpp b/src/badguy/totem.cpp
index 70bd850..42afee2 100644 (file)
--- a/src/badguy/totem.cpp
+++ b/src/badguy/totem.cpp
@@ -33,7 +33,7 @@ Totem::Totem(const Reader& reader) :
   carrying(0),
   carried_by(0)
 {
-  sound_manager->preload( LAND_ON_TOTEM_SOUND );
+  SoundManager::current()->preload( LAND_ON_TOTEM_SOUND );
 }
 
 Totem::~Totem()
@@ -86,7 +86,7 @@ Totem::active_update(float elapsed_time)
     Sector* s = Sector::current();
     if (s) {
       // jump a bit if we find a suitable totem
-      for (std::vector<MovingObject*>::iterator i = s->moving_objects.begin(); i != s->moving_objects.end(); i++) {
+      for (std::vector<MovingObject*>::iterator i = s->moving_objects.begin(); i != s->moving_objects.end(); ++i) {
         Totem* t = dynamic_cast<Totem*>(*i);
         if (!t) continue;
 
@@ -222,7 +222,7 @@ Totem::jump_on(Totem* target)
   this->initialize();
   bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
 
-  sound_manager->play( LAND_ON_TOTEM_SOUND , get_pos());
+  SoundManager::current()->play( LAND_ON_TOTEM_SOUND , get_pos());
 
   this->synchronize_with(target);
 }