projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
81f44c7
)
fixed BSOD hopping
author
Tobias Gläßer
<tobi.web@gmx.de>
Sat, 27 Mar 2004 00:14:46 +0000
(
00:14
+0000)
committer
Tobias Gläßer
<tobi.web@gmx.de>
Sat, 27 Mar 2004 00:14:46 +0000
(
00:14
+0000)
SVN-Revision: 385
src/badguy.cpp
patch
|
blob
|
history
src/badguy.h
patch
|
blob
|
history
diff --git
a/src/badguy.cpp
b/src/badguy.cpp
index
611ddcf
..
0c76659
100644
(file)
--- a/
src/badguy.cpp
+++ b/
src/badguy.cpp
@@
-124,7
+124,7
@@
void BadGuy::action_bsod()
if (!dying)
check_horizontal_bump();
- fall();
+ fall(
true
);
// Handle dying timer:
if (dying == DYING_SQUISHED)
@@
-260,7
+260,7
@@
void BadGuy::check_horizontal_bump(bool checkcliff)
}
}
-void BadGuy::fall()
+void BadGuy::fall(
bool dojump
)
{
/* Fall if we get off the ground: */
if (dying != DYING_FALLING)
@@
-270,7
+270,7
@@
void BadGuy::fall()
if(!physic_is_set(&physic))
{
physic_set_state(&physic,PH_VT);
- physic_set_start_vy(&physic,0.);
+ physic_set_start_vy(&physic,
dojump ? 2. :
0.);
}
if(mode != HELD)
diff --git
a/src/badguy.h
b/src/badguy.h
index
ca4e16c
..
76d25cc
100644
(file)
--- a/
src/badguy.h
+++ b/
src/badguy.h
@@
-106,7
+106,7
@@
class BadGuy
CollisionType type = COLLISION_NORMAL);
private:
- void fall();
+ void fall(
bool dojump=false
);
void remove_me();
void action_bsod();