X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=32420f14d8ebbb58d0300c90be12f3e3db814e88;hb=f1e15f44f709d6b4fa45e858dc12d7d701ae8ddc;hp=a7f748214f118e4f2889dec613327fd9b76b0402;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index a7f748214..32420f14d 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -1,14 +1,31 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  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 "defines.h"
 #include "resources.h"
 #include "camera.h"
 #include "sector.h"
 #include "player.h"
-#include "app/globals.h"
-#include "special/sprite_manager.h"
+#include "sprite/sprite_manager.h"
 
 GrowUp::GrowUp(const Vector& pos)
 {
@@ -35,7 +52,7 @@ HitResponse
 GrowUp::collision(GameObject& other, const CollisionHit& hit)
 {
   if(other.get_flags() & FLAG_SOLID) {
-    if(fabsf(hit.normal.y) > .5) { // roof
+    if(fabsf(hit.normal.y) > .5) { // roof or ground
       physic.set_velocity_y(0);
     } else { // bumped left or right
       physic.set_velocity_x(-physic.get_velocity_x());
@@ -46,8 +63,8 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
   
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    player->grow();
-    SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT));
+    player->set_bonus(GROWUP_BONUS, true);
+    sound_manager->play_sound("grow");
     remove_me();
     
     return ABORT_MOVE;