projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cr/lfs and remove trailing whitespaces...
[supertux.git]
/
src
/
badguy
/
flyingsnowball.cpp
diff --git
a/src/badguy/flyingsnowball.cpp
b/src/badguy/flyingsnowball.cpp
index
66a2db5
..
517f6b9
100644
(file)
--- a/
src/badguy/flyingsnowball.cpp
+++ b/
src/badguy/flyingsnowball.cpp
@@
-57,7
+57,7
@@
FlyingSnowBall::write(lisp::Writer& writer)
writer.end_list("flyingsnowball");
}
writer.end_list("flyingsnowball");
}
-void
+void
FlyingSnowBall::activate()
{
sprite->set_action(dir == LEFT ? "left" : "right");
FlyingSnowBall::activate()
{
sprite->set_action(dir == LEFT ? "left" : "right");
@@
-84,7
+84,7
@@
FlyingSnowBall::collision_solid(const CollisionHit& hit)
}
void
}
void
-FlyingSnowBall::active_update(float elapsed_time)
+FlyingSnowBall::active_update(float elapsed_time)
{
if(timer.check()) {
if(mode == FLY_UP) {
{
if(timer.check()) {
if(mode == FLY_UP) {
@@
-93,7
+93,7
@@
FlyingSnowBall::active_update(float elapsed_time)
// stop puffing
puff_timer.stop();
// stop puffing
puff_timer.stop();
-
+
} else if(mode == FLY_DOWN) {
mode = FLY_UP;
physic.set_velocity_y(FLYSPEED);
} else if(mode == FLY_DOWN) {
mode = FLY_UP;
physic.set_velocity_y(FLYSPEED);