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
/
jumpy.cpp
diff --git
a/src/badguy/jumpy.cpp
b/src/badguy/jumpy.cpp
index
706a7d7
..
20b3f51
100644
(file)
--- a/
src/badguy/jumpy.cpp
+++ b/
src/badguy/jumpy.cpp
@@
-26,8
+26,10
@@
static const float JUMPY_MID_TOLERANCE=4;
static const float JUMPY_LOW_TOLERANCE=2;
Jumpy::Jumpy(const lisp::Lisp& reader)
static const float JUMPY_LOW_TOLERANCE=2;
Jumpy::Jumpy(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/
jumpy/
jumpy.sprite"), groundhit_pos_set(false)
+ : BadGuy(reader, "images/creatures/
snowjumpy/snow
jumpy.sprite"), groundhit_pos_set(false)
{
{
+ // TODO create a nice sound for this...
+ //sound_manager->preload("sounds/skid.wav");
}
void
}
void
@@
-63,7
+65,7
@@
Jumpy::hit(const CollisionHit& chit)
groundhit_pos_set = true;
}
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) {
// TODO create a nice sound for this...
//sound_manager->play("sounds/skid.wav");
} else if(chit.top) {