projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6de32d1
)
#305: applied tripod's patch to stop Jumpy from making one extra jump after being...
author
Ryan Flegel
<rflegel@gmail.com>
Thu, 12 Jun 2008 21:04:02 +0000
(21:04 +0000)
committer
Ryan Flegel
<rflegel@gmail.com>
Thu, 12 Jun 2008 21:04:02 +0000
(21:04 +0000)
SVN-Revision: 5566
src/badguy/jumpy.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/jumpy.cpp
b/src/badguy/jumpy.cpp
index
defb545
..
20b3f51
100644
(file)
--- a/
src/badguy/jumpy.cpp
+++ b/
src/badguy/jumpy.cpp
@@
-65,7
+65,7
@@
Jumpy::hit(const CollisionHit& chit)
groundhit_pos_set = true;
}
- physic.set_velocity_y(
frozen
? 0 : JUMPSPEED);
+ physic.set_velocity_y(
(frozen || get_state() == STATE_FALLING)
? 0 : JUMPSPEED);
// TODO create a nice sound for this...
//sound_manager->play("sounds/skid.wav");
} else if(chit.top) {