projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use svnversion program rather than finding the svn package to get revision number
[supertux.git]
/
src
/
badguy
/
bouncing_snowball.cpp
diff --git
a/src/badguy/bouncing_snowball.cpp
b/src/badguy/bouncing_snowball.cpp
index
72d1acf
..
2d90433
100644
(file)
--- a/
src/badguy/bouncing_snowball.cpp
+++ b/
src/badguy/bouncing_snowball.cpp
@@
-25,7
+25,7
@@
static const float JUMPSPEED = -450;
static const float WALKSPEED = 80;
BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader)
static const float WALKSPEED = 80;
BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
+
: BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
{
}
{
}
@@
-46,17
+46,17
@@
BouncingSnowball::write(lisp::Writer& writer)
}
void
}
void
-BouncingSnowball::
activat
e()
+BouncingSnowball::
initializ
e()
{
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
sprite->set_action(dir == LEFT ? "left" : "right");
}
bool
{
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
sprite->set_action(dir == LEFT ? "left" : "right");
}
bool
-BouncingSnowball::collision_squished(
Player& player
)
+BouncingSnowball::collision_squished(
GameObject& object
)
{
sprite->set_action("squished");
{
sprite->set_action("squished");
- kill_squished(
player
);
+ kill_squished(
object
);
return true;
}
return true;
}