X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fpowerup.cpp;h=b865ba81be73f9fd3fa5ff6b3b8d27e3b9622be8;hb=a11c10918be7bef5a3a6fc30e009fda719ca221f;hp=8cc0e7e4a4d070ecd07c048fe401f61197cba879;hpb=0540d5db4c57c585615a78ccf33603ff3628db95;p=supertux.git

diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
index 8cc0e7e4a..b865ba81b 100644
--- a/src/object/powerup.cpp
+++ b/src/object/powerup.cpp
@@ -1,7 +1,7 @@
-//  $Id: growup.cpp 2458 2005-05-10 11:29:58Z matzebraun $
-// 
+//  $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,90 +12,84 @@
 //  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 <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 "scripting/script_interpreter.hpp"
+#include "log.hpp"
 
 PowerUp::PowerUp(const lisp::Lisp& lisp)
+  : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING)
 {
-  std::string sprite_name;
-  lisp.get("x", bbox.p1.x);
-  lisp.get("y", bbox.p1.y);
-  lisp.get("sprite", sprite_name);
   lisp.get("script", script);
-  bbox.set_size(32, 32);   
-  sprite = sprite_manager->create(sprite_name);
+  no_physics = false;
+  lisp.get("disable-physics", no_physics);
   physic.enable_gravity(true);
+  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 != "") {
-    ScriptInterpreter::add_script_object(Sector::current(), "powerup-script",
-        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->get_name() == "egg") {
-    player->set_bonus(GROWUP_BONUS, true);
-    sound_manager->play("sounds/grow.ogg");
-  } else if (sprite->get_name() == "fireflower") {
-    player->set_bonus(FIRE_BONUS, true);
-    sound_manager->play("sounds/fire-flower.ogg");
-  } else if (sprite->get_name() == "star") {
+  if (sprite_name == "images/powerups/egg/egg.sprite") {
+    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") {
+    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->get_name() == "1up") {
-    player->get_status()->incLives();
+  } else if (sprite_name == "images/powerups/1up/1up.sprite") {
+    player->get_status()->add_coins(100);
   }
+
+  remove_me();
   return ABORT_MOVE;
 }
 
 void
 PowerUp::update(float elapsed_time)
 {
-  movement = physic.get_movement(elapsed_time);
-}
-
-void
-PowerUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  if (!no_physics)
+    movement = physic.get_movement(elapsed_time);
 }
 
 IMPLEMENT_FACTORY(PowerUp, "powerup");