projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blind commit, please test: use squirrel datatypes
[supertux.git]
/
src
/
object
/
powerup.cpp
diff --git
a/src/object/powerup.cpp
b/src/object/powerup.cpp
index
ad0f3df
..
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
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,14
+12,16
@@
// 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.
// 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
// 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 <config.h>
+#include <stdexcept>
#include <math.h>
#include <math.h>
+#include <stdexcept>
#include "powerup.hpp"
#include "resources.hpp"
#include "player.hpp"
#include "powerup.hpp"
#include "resources.hpp"
#include "player.hpp"
@@
-27,14
+29,14
@@
#include "audio/sound_manager.hpp"
#include "object_factory.hpp"
#include "sector.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)
{
PowerUp::PowerUp(const lisp::Lisp& lisp)
{
- std::string sprite_name;
lisp.get("x", bbox.p1.x);
lisp.get("y", bbox.p1.y);
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);
lisp.get("script", script);
no_physics = false;
lisp.get("disable-physics", no_physics);
@@
-57,8
+59,6
@@
PowerUp::collision(GameObject& other, const CollisionHit& hit)
if(fabsf(hit.normal.y) > .5) { // roof or ground
physic.set_velocity_y(0);
} else { // bumped left or right
if(fabsf(hit.normal.y) > .5) { // roof or ground
physic.set_velocity_y(0);
} else { // bumped left or right
- printf("Normal: %f %f\n", hit.normal.x, hit.normal.y);
- printf("LRbounce, new speed. %f\n", physic.get_velocity_x());
physic.set_velocity_x(-physic.get_velocity_x());
}
physic.set_velocity_x(-physic.get_velocity_x());
}
@@
-72,22
+72,22
@@
PowerUp::collision(GameObject& other, const CollisionHit& hit)
remove_me();
if (script != "") {
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;
}
return ABORT_MOVE;
}
-
+
// some defaults if no script has been set
// some defaults if no script has been set
- if (sprite
->get_name() == "egg
") {
- player->
set
_bonus(GROWUP_BONUS, true);
+ if (sprite
_name == "images/powerups/egg/egg.sprite
") {
+ player->
add
_bonus(GROWUP_BONUS, true);
sound_manager->play("sounds/grow.wav");
sound_manager->play("sounds/grow.wav");
- } else if (sprite
->get_name() == "fireflower
") {
- player->
set
_bonus(FIRE_BONUS, true);
+ } else if (sprite
_name == "images/powerups/fireflower/fireflower.sprite
") {
+ player->
add
_bonus(FIRE_BONUS, true);
sound_manager->play("sounds/fire-flower.wav");
sound_manager->play("sounds/fire-flower.wav");
- } else if (sprite
->get_name() == "star
") {
+ } else if (sprite
_name == "images/powerups/star/star.sprite
") {
player->make_invincible();
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;
}
}
return ABORT_MOVE;
}