Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32627/src
Modified Files:
badguy.cpp badguy.h
Log Message:
fixed BSOD hopping
Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- badguy.h 26 Mar 2004 23:53:31 -0000 1.16
+++ badguy.h 27 Mar 2004 00:14:46 -0000 1.17
@@ -106,7 +106,7 @@
CollisionType type = COLLISION_NORMAL);
private:
- void fall();
+ void fall(bool dojump=false);
void remove_me();
void action_bsod();
Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- badguy.cpp 26 Mar 2004 23:53:31 -0000 1.14
+++ badguy.cpp 27 Mar 2004 00:14:46 -0000 1.15
@@ -124,7 +124,7 @@
if (!dying)
check_horizontal_bump();
- fall();
+ fall(true);
// Handle dying timer:
if (dying == DYING_SQUISHED)
@@ -260,7 +260,7 @@
}
}
-void BadGuy::fall()
+void BadGuy::fall(bool dojump)
{
/* Fall if we get off the ground: */
if (dying != DYING_FALLING)
@@ -270,7 +270,7 @@
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)
|
