projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02d54bd
)
small fixes (timing and animation) on nolok
author
Marek Moeckel
<wansti@gmx.de>
Fri, 26 Nov 2004 17:08:53 +0000
(17:08 +0000)
committer
Marek Moeckel
<wansti@gmx.de>
Fri, 26 Nov 2004 17:08:53 +0000
(17:08 +0000)
SVN-Revision: 2204
src/badguy/nolok_01.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/nolok_01.cpp
b/src/badguy/nolok_01.cpp
index
1090d97
..
16214aa
100644
(file)
--- a/
src/badguy/nolok_01.cpp
+++ b/
src/badguy/nolok_01.cpp
@@
-6,7
+6,7
@@
#define WALK_TIME 2.5
#define SHOOT_TIME 0.4
-#define JUMP_TIME 0.
3
+#define JUMP_TIME 0.
5
static const float WALKSPEED = 90;
@@
-55,6
+55,7
@@
Nolok_01::active_action(float elapsed_time)
switch (action) {
case WALKING:
{
+ sprite->set_action("jump");
physic.set_velocity_y(700);
action = JUMPING;
action_timer.start(JUMP_TIME);