projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f53572a
)
Fixed bug I introduced with last commit
author
Ryan Flegel
<rflegel@gmail.com>
Fri, 28 Apr 2006 04:04:44 +0000
(
04:04
+0000)
committer
Ryan Flegel
<rflegel@gmail.com>
Fri, 28 Apr 2006 04:04:44 +0000
(
04:04
+0000)
SVN-Revision: 3457
src/badguy/mriceblock.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/mriceblock.cpp
b/src/badguy/mriceblock.cpp
index
1ec23a9
..
74b515d
100644
(file)
--- a/
src/badguy/mriceblock.cpp
+++ b/
src/badguy/mriceblock.cpp
@@
-148,18
+148,16
@@
MrIceBlock::collision_player(Player& player, const CollisionHit& hit)
// handle kicks from left or right side
if(ice_state == ICESTATE_FLAT && get_state() == STATE_ACTIVE) {
// handle kicks from left or right side
if(ice_state == ICESTATE_FLAT && get_state() == STATE_ACTIVE) {
- // Don't kick if the player is going to pick us up
- if (player.get_controller()->hold(Controller::ACTION))
- return FORCE_MOVE;
-
// hit from left side
// hit from left side
- if(hit.normal.x > 0.7) {
+ if(hit.normal.x > 0.7 &&
+ !player.get_controller()->hold(Controller::ACTION)) {
dir = RIGHT;
player.kick();
set_state(ICESTATE_KICKED);
return FORCE_MOVE;
}
dir = RIGHT;
player.kick();
set_state(ICESTATE_KICKED);
return FORCE_MOVE;
}
- else if(hit.normal.x < -0.7) {
+ else if(hit.normal.x < -0.7 &&
+ !player.get_controller()->hold(Controller::ACTION)) {
dir = LEFT;
player.kick();
set_state(ICESTATE_KICKED);
dir = LEFT;
player.kick();
set_state(ICESTATE_KICKED);