projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8dfd372
)
- commited MatzeBs duck fix
author
Ingo Ruhnke
<grumbel@gmx.de>
Tue, 13 Apr 2004 18:17:26 +0000
(18:17 +0000)
committer
Ingo Ruhnke
<grumbel@gmx.de>
Tue, 13 Apr 2004 18:17:26 +0000
(18:17 +0000)
SVN-Revision: 522
src/player.cpp
patch
|
blob
|
history
diff --git
a/src/player.cpp
b/src/player.cpp
index
3b8400b
..
ddb8104
100644
(file)
--- a/
src/player.cpp
+++ b/
src/player.cpp
@@
-169,7
+169,6
@@
Player::action(double frame_ratio)
/* Move tux: */
previous_base = base;
/* Move tux: */
previous_base = base;
- duck = false;
physic.apply(frame_ratio, base.x, base.y);
if(dying == DYING_NOT) {
physic.apply(frame_ratio, base.x, base.y);
if(dying == DYING_NOT) {
@@
-292,23
+291,6
@@
Player::action(double frame_ratio)
player_status.next_level = 1;
}
player_status.next_level = 1;
}
- /* Duck! */
- if (input.down == DOWN && size == BIG && !duck)
- {
- duck = true;
- base.height = 32;
- base.y += 32;
- // changing base size confuses collision otherwise
- old_base = previous_base = base;
- }
- else if(input.down == UP && size == BIG && duck)
- {
- duck = false;
- base.y -= 32;
- base.height = 64;
- old_base = previous_base = base;
- }
-
// check some timers
skidding_timer.check();
invincible_timer.check();
// check some timers
skidding_timer.check();
invincible_timer.check();