replaced bell object with firefly, renamed all hooks back to bell. Changed phone...

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

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index da9aae1..cb98a2d 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -20,20 +20,22 @@
 #include <config.h>
 
 #include <math.h>
-#include "growup.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "sprite/sprite_manager.h"
+#include "growup.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "player.hpp"
+#include "audio/sound_manager.hpp"
+#include "sprite/sprite_manager.hpp"
 
 GrowUp::GrowUp()
 {
   bbox.set_size(32, 32);
   
-  sprite = sprite_manager->create("egg");
+  sprite = sprite_manager->create("images/powerups/egg/egg.sprite");
   physic.enable_gravity(true);
   physic.set_velocity_x(100);
+  set_group(COLGROUP_MOVING);
 }
 
 GrowUp::~GrowUp()
@@ -63,7 +65,7 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
     player->set_bonus(GROWUP_BONUS, true);
-    sound_manager->play_sound("grow");
+    sound_manager->play("sounds/grow.wav");
     remove_me();
     
     return ABORT_MOVE;