New GameObject SpriteParticle

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

diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
index 1f338a6..4e14f93 100644 (file)
--- 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,33 +12,39 @@
 //  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 "powerup.h"
-#include "resources.h"
-#include "player.h"
-#include "sprite/sprite_manager.h"
-#include "audio/sound_manager.h"
-#include "object_factory.h"
-#include "sector.h"
-#include "scripting/script_interpreter.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)
 {
-  std::string sprite_name;
   lisp.get("x", bbox.p1.x);
   lisp.get("y", bbox.p1.y);
-  lisp.get("sprite", sprite_name);
+  if (!lisp.get("sprite", sprite_name))
+    throw std::runtime_error("no sprite file set for powerup");
   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);
 }
 
 PowerUp::~PowerUp()
@@ -66,22 +72,22 @@ PowerUp::collision(GameObject& other, const CollisionHit& hit)
   remove_me();
 
   if (script != "") {
-    ScriptInterpreter::add_script_object(Sector::current(), "powerup-script",
-        script);
+    std::istringstream stream(script);
+    Sector::current()->run_script(stream, "powerup-script");
     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("grow");
-  } else if (sprite->get_name() == "fireflower") {
-    player->set_bonus(FIRE_BONUS, true);
-    sound_manager->play("fire-flower");
-  } else if (sprite->get_name() == "star") {
+  if (sprite_name == "images/powerups/egg/egg.sprite") {
+    player->add_bonus(GROWUP_BONUS, true);
+    sound_manager->play("sounds/grow.wav");
+  } else if (sprite_name == "images/powerups/fireflower/fireflower.sprite") {
+    player->add_bonus(FIRE_BONUS, true);
+    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);
   }
   return ABORT_MOVE;
 }
@@ -89,7 +95,8 @@ PowerUp::collision(GameObject& other, const CollisionHit& hit)
 void
 PowerUp::update(float elapsed_time)
 {
-  movement = physic.get_movement(elapsed_time);
+  if (!no_physics)
+    movement = physic.get_movement(elapsed_time);
 }
 
 void