fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index a7f7482..1d256db 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -1,64 +1,68 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 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 "growup.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "player.hpp"
+#include "audio/sound_manager.hpp"
 
-GrowUp::GrowUp(const Vector& pos)
+GrowUp::GrowUp(Direction direction)
+       : MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  
-  sprite = sprite_manager->create("egg");
   physic.enable_gravity(true);
-  physic.set_velocity_x(100);
+  physic.set_velocity_x((direction == LEFT)?-100:100);
+  sound_manager->preload("sounds/grow.wav");
 }
 
-GrowUp::~GrowUp()
+void
+GrowUp::update(float elapsed_time)
 {
-  delete sprite;
+  movement = physic.get_movement(elapsed_time);
 }
 
 void
-GrowUp::action(float elapsed_time)
+GrowUp::collision_solid(const CollisionHit& hit)
 {
-  movement = physic.get_movement(elapsed_time);
+  if(hit.top || hit.bottom)
+    physic.set_velocity_y(0);
+  if(hit.left || hit.right)
+    physic.set_velocity_x(-physic.get_velocity_x());
 }
 
 HitResponse
-GrowUp::collision(GameObject& other, const CollisionHit& hit)
+GrowUp::collision(GameObject& other, const CollisionHit& )
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    if(fabsf(hit.normal.y) > .5) { // roof
-      physic.set_velocity_y(0);
-    } else { // bumped left or right
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
-
-    return CONTINUE;
-  }
-  
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    player->grow();
-    SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT));
+    if(!player->add_bonus(GROWUP_BONUS, true))
+      return FORCE_MOVE;
+
+    sound_manager->play("sounds/grow.wav");
     remove_me();
-    
+
     return ABORT_MOVE;
   }
 
   return FORCE_MOVE;
 }
-
-void
-GrowUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-