support for centered text in scripts

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

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 948955d..6f0fe5e 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -17,21 +17,19 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include <math.h>
-#include "growup.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "app/globals.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(const Vector& pos)
+GrowUp::GrowUp()
 {
-  bbox.set_pos(pos);
   bbox.set_size(32, 32);
   
   sprite = sprite_manager->create("egg");
@@ -45,7 +43,7 @@ GrowUp::~GrowUp()
 }
 
 void
-GrowUp::action(float elapsed_time)
+GrowUp::update(float elapsed_time)
 {
   movement = physic.get_movement(elapsed_time);
 }
@@ -66,7 +64,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;