X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=4990cf09bfe5cabe35ccbd7ab1cecf91ab04d002;hb=cbb015c68e184f5c19d0483a486325c1ee819086;hp=948955dce11de0e96a7a120f64ba7a9a1b613a9d;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 948955dce..4990cf09b 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -1,74 +1,63 @@
-//  $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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  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 3 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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#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 "audio/sound_manager.hpp"
+#include "object/growup.hpp"
+#include "object/player.hpp"
 
-GrowUp::GrowUp(const Vector& pos)
+GrowUp::GrowUp(Direction direction) :
+  MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING),
+  physic()
 {
-  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;
   }
 
@@ -76,8 +65,9 @@ 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);
 }
 
+/* EOF */