projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e33d068
)
Move falling badguys to LAYER_FALLING (= 500), fixes bug 1033
author
Tobias Markus
<tobbi@mozilla-uk.org>
Sun, 13 Oct 2013 20:31:53 +0000
(22:31 +0200)
committer
Tobias Markus
<tobbi@mozilla-uk.org>
Sat, 26 Oct 2013 16:45:26 +0000
(18:45 +0200)
src/badguy/badguy.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/badguy.cpp
b/src/badguy/badguy.cpp
index
51b701a
..
4d3c572
100644
(file)
--- a/
src/badguy/badguy.cpp
+++ b/
src/badguy/badguy.cpp
@@
-31,6
+31,7
@@
static const float SQUISH_TIME = 2;
static const float X_OFFSCREEN_DISTANCE = 1280;
static const float Y_OFFSCREEN_DISTANCE = 800;
+static const int LAYER_FALLING = 500;
BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer) :
MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED),
@@
-394,6
+395,7
@@
BadGuy::kill_fall()
physic.set_acceleration_y(0);
physic.enable_gravity(true);
set_state(STATE_FALLING);
+ layer = LAYER_FALLING;
// start dead-script
run_dead_script();