Fix for coverity #29409 - Use char 0 instead of NULL

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

diff --git a/src/badguy/mole_rock.cpp b/src/badguy/mole_rock.cpp
index efe5e00..b4ef0bf 100644 (file)
--- a/src/badguy/mole_rock.cpp
+++ b/src/badguy/mole_rock.cpp
@@ -20,24 +20,26 @@
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
-MoleRock::MoleRock(const Reader& reader)
-  : BadGuy(reader, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2), parent(0), initial_velocity(Vector(0, -400))
+MoleRock::MoleRock(const Reader& reader) :
+  BadGuy(reader, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2),
+  parent(0),
+  initial_velocity(Vector(0, -400))
 {
   physic.enable_gravity(true);
   countMe = false;
-  sound_manager->preload("sounds/darthit.wav");
-  sound_manager->preload("sounds/stomp.wav");
+  SoundManager::current()->preload("sounds/darthit.wav");
+  SoundManager::current()->preload("sounds/stomp.wav");
 }
 
-MoleRock::MoleRock(const Vector& pos, const Vector& velocity, const BadGuy* parent = 0) :
-  BadGuy(pos, LEFT, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2), 
-  parent(parent), 
+MoleRock::MoleRock(const Vector& pos, const Vector& velocity, const BadGuy* parent_ = 0) :
+  BadGuy(pos, LEFT, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2),
+  parent(parent_),
   initial_velocity(velocity)
 {
   physic.enable_gravity(true);
   countMe = false;
-  sound_manager->preload("sounds/darthit.wav");
-  sound_manager->preload("sounds/stomp.wav");
+  SoundManager::current()->preload("sounds/darthit.wav");
+  SoundManager::current()->preload("sounds/stomp.wav");
 }
 
 MoleRock::~MoleRock()
@@ -76,7 +78,7 @@ MoleRock::active_update(float elapsed_time)
 void
 MoleRock::collision_solid(const CollisionHit& )
 {
-  sound_manager->play("sounds/darthit.wav", get_pos());
+  SoundManager::current()->play("sounds/darthit.wav", get_pos());
   remove_me();
 }
 
@@ -87,7 +89,7 @@ MoleRock::collision_badguy(BadGuy& badguy, const CollisionHit& )
   if (&badguy == parent) {
     return FORCE_MOVE;
   }
-  sound_manager->play("sounds/stomp.wav", get_pos());
+  SoundManager::current()->play("sounds/stomp.wav", get_pos());
   remove_me();
   badguy.kill_fall();
   return ABORT_MOVE;
@@ -96,11 +98,9 @@ MoleRock::collision_badguy(BadGuy& badguy, const CollisionHit& )
 HitResponse
 MoleRock::collision_player(Player& player, const CollisionHit& hit)
 {
-  sound_manager->play("sounds/stomp.wav", get_pos());
+  SoundManager::current()->play("sounds/stomp.wav", get_pos());
   remove_me();
   return BadGuy::collision_player(player, hit);
 }
 
-IMPLEMENT_FACTORY(MoleRock, "mole_rock");
-
 /* EOF */