-// $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
// 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"
{
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);
// some defaults if no script has been set
if (sprite_name == "images/powerups/egg/egg.sprite") {
- player->set_bonus(GROWUP_BONUS, true);
+ player->add_bonus(GROWUP_BONUS, true);
sound_manager->play("sounds/grow.wav");
} else if (sprite_name == "images/powerups/fireflower/fireflower.sprite") {
- player->set_bonus(FIRE_BONUS, true);
+ 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_name == "images/powerups/1up/1up.sprite") {
- player->get_status()->incLives();
+ player->get_status()->add_coins(100);
}
return ABORT_MOVE;
}