X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=d422c2a10c8a4a775bd5098d4d91c4f7a285f082;hb=7e15c4f871809033278711a6e9327616da00c4c9;hp=32420f14d8ebbb58d0300c90be12f3e3db814e88;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 32420f14d..d422c2a10 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,61 +12,60 @@
 //  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.
+//  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 "sprite/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.ogg");
 }
 
-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)
+    physic.set_velocity_y(0);
+  if(hit.bottom && physic.get_velocity_y() > 0)
+    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& hit )
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    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());
-    }
-
-    return CONTINUE;
-  }
-  
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    player->set_bonus(GROWUP_BONUS, true);
-    sound_manager->play_sound("grow");
+    if(!player->add_bonus(GROWUP_BONUS, true)){
+      // Tux can't grow right now.
+      collision_solid( hit );
+      return ABORT_MOVE;
+    }
+
+    sound_manager->play("sounds/grow.ogg");
     remove_me();
-    
+
     return ABORT_MOVE;
   }
 
@@ -74,8 +73,7 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
 }
 
 void
-GrowUp::draw(DrawingContext& context)
+GrowUp::do_jump()
 {
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+    physic.set_velocity_y(-300);
 }
-