projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating cherrybomb, adding juicebox (blue bomb).
[supertux.git]
/
src
/
badguy
/
poisonivy.cpp
diff --git
a/src/badguy/poisonivy.cpp
b/src/badguy/poisonivy.cpp
index
dfcfa3d
..
ae11827
100644
(file)
--- a/
src/badguy/poisonivy.cpp
+++ b/
src/badguy/poisonivy.cpp
@@
-28,19
+28,11
@@
static const float WALKSPEED = 80;
PoisonIvy::PoisonIvy(const lisp::Lisp& reader)
: BadGuy(reader, "images/creatures/poison_ivy/poison_ivy.sprite")
{
PoisonIvy::PoisonIvy(const lisp::Lisp& reader)
: BadGuy(reader, "images/creatures/poison_ivy/poison_ivy.sprite")
{
- set_direction = false;
- reader.get("direction", direction);
- if( direction != "auto" && direction != ""){
- set_direction = true;
- initial_direction = str2dir( direction );
- }
}
PoisonIvy::PoisonIvy(const Vector& pos, Direction d)
}
PoisonIvy::PoisonIvy(const Vector& pos, Direction d)
- : BadGuy(pos, "images/creatures/poison_ivy/poison_ivy.sprite")
+ : BadGuy(pos,
d,
"images/creatures/poison_ivy/poison_ivy.sprite")
{
{
- set_direction = true;
- initial_direction = d;
}
void
}
void
@@
-48,7
+40,6
@@
PoisonIvy::write(lisp::Writer& writer)
{
writer.start_list("poisonivy");
{
writer.start_list("poisonivy");
- writer.write_string("direction", direction);
writer.write_float("x", start_position.x);
writer.write_float("y", start_position.y);
writer.write_float("x", start_position.x);
writer.write_float("y", start_position.y);
@@
-58,7
+49,6
@@
PoisonIvy::write(lisp::Writer& writer)
void
PoisonIvy::activate()
{
void
PoisonIvy::activate()
{
- if (set_direction) {dir = initial_direction;}
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
sprite->set_action(dir == LEFT ? "left" : "right");
}
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
sprite->set_action(dir == LEFT ? "left" : "right");
}