X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fpowerup.cpp;h=09a747063e4d402318e99ee2bd80e0e893447b09;hb=ab9eab4c870195c2b60ce76b77044c35b31e8806;hp=2e401ae765d49f6923008c8734dcd3f6c4bfaaae;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
index 2e401ae76..09a747063 100644
--- a/src/object/powerup.cpp
+++ b/src/object/powerup.cpp
@@ -19,73 +19,69 @@
 
 #include <config.h>
 
+#include <stdexcept>
 #include <math.h>
+#include <stdexcept>
 #include "powerup.hpp"
 #include "resources.hpp"
 #include "player.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "audio/sound_manager.hpp"
 #include "object_factory.hpp"
 #include "sector.hpp"
 #include "log.hpp"
 
 PowerUp::PowerUp(const lisp::Lisp& lisp)
+  : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING)
 {
-  lisp.get("x", bbox.p1.x);
-  lisp.get("y", bbox.p1.y);
-  lisp.get("sprite", sprite_name);
   lisp.get("script", script);
   no_physics = false;
   lisp.get("disable-physics", no_physics);
-  bbox.set_size(32, 32);   
-  sprite = sprite_manager->create(sprite_name);
   physic.enable_gravity(true);
-
-  set_group(COLGROUP_MOVING);
+  sound_manager->preload("sounds/grow.wav");
+  sound_manager->preload("sounds/fire-flower.wav");
 }
 
-PowerUp::~PowerUp()
+void
+PowerUp::collision_solid(const CollisionHit& hit)
 {
-  delete sprite;
+  if(hit.bottom) {
+    physic.set_velocity_y(0);
+  }
+  if(hit.right || hit.left) {
+    physic.set_velocity_x(-physic.get_velocity_x());
+  }
 }
 
 HitResponse
-PowerUp::collision(GameObject& other, const CollisionHit& hit)
+PowerUp::collision(GameObject& other, const CollisionHit&)
 {
-  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)
     return FORCE_MOVE;
 
-  remove_me();
-
   if (script != "") {
     std::istringstream stream(script);
     Sector::current()->run_script(stream, "powerup-script");
+    remove_me();
     return ABORT_MOVE;
   }
 
   // some defaults if no script has been set
   if (sprite_name == "images/powerups/egg/egg.sprite") {
-    player->set_bonus(GROWUP_BONUS, true);
+    if(!player->add_bonus(GROWUP_BONUS, true))
+      return FORCE_MOVE;
     sound_manager->play("sounds/grow.wav");
   } else if (sprite_name == "images/powerups/fireflower/fireflower.sprite") {
-    player->set_bonus(FIRE_BONUS, true);
+    if(!player->add_bonus(FIRE_BONUS, true))
+      return FORCE_MOVE;
     sound_manager->play("sounds/fire-flower.wav");
   } else if (sprite_name == "images/powerups/star/star.sprite") {
     player->make_invincible();
   } else if (sprite_name == "images/powerups/1up/1up.sprite") {
     player->get_status()->add_coins(100);
   }
+
+  remove_me();
   return ABORT_MOVE;
 }
 
@@ -96,11 +92,4 @@ PowerUp::update(float elapsed_time)
     movement = physic.get_movement(elapsed_time);
 }
 
-void
-PowerUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-
 IMPLEMENT_FACTORY(PowerUp, "powerup");
-