qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-24 21:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added the jumping bug fix (from the main qf tree)

Browse source
This commit is contained in:
Anton E. Gavrilov 2000-05-17 09:11:11 +00:00
parent 0b7e010ad4
commit 04a4e65a9a
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/pmove.c
View file

@ -55,6 +55,7 @@ vec3_t player_maxs = {16, 16, 32};
// #define PM_WATERFRICTION 1 // #define PM_WATERFRICTION 1
void PM_InitBoxHull (void); void PM_InitBoxHull (void);
void PM_CategorizePosition (void);
void Pmove_Init (void) void Pmove_Init (void)
{ {
@ -559,6 +560,7 @@ void PM_AirMove (void)
float fmove, smove; float fmove, smove;
vec3_t wishdir; vec3_t wishdir;
float wishspeed; float wishspeed;
vec3_t original;
fmove = pmove.cmd.forwardmove; fmove = pmove.cmd.forwardmove;
smove = pmove.cmd.sidemove; smove = pmove.cmd.sidemove;
@ -604,8 +606,24 @@ void PM_AirMove (void)
// add gravity // add gravity
pmove.velocity[2] -= movevars.entgravity * movevars.gravity * frametime; pmove.velocity[2] -= movevars.entgravity * movevars.gravity * frametime;
PM_FlyMove (); if ( ! PM_FlyMove() )
{
// the move didn't get blocked
PM_CategorizePosition ();
if (onground != -1) // but we're on ground now
{
// This is a hack to fix the jumping bug
VectorCopy (pmove.origin, original);
// Calculate correct velocity
if ( ! PM_FlyMove() )
{
// This shouldn't probably happen (?)
if (pmove.velocity[2] < 0)
pmove.velocity[2] = 0;
}
VectorCopy (original, pmove.origin);
}
}
} }
//Con_Printf("airmove:vec: %4.2f %4.2f %4.2f\n", //Con_Printf("airmove:vec: %4.2f %4.2f %4.2f\n",
@ -622,10 +640,10 @@ void PM_AirMove (void)
/* /*
============= =============
PM_CatagorizePosition PM_CategorizePosition
============= =============
*/ */
void PM_CatagorizePosition (void) void PM_CategorizePosition (void)
{ {
vec3_t point; vec3_t point;
int cont; int cont;
@ -929,7 +947,7 @@ void PlayerMove (void)
VectorCopy (pmove.cmd.angles, pmove.angles); VectorCopy (pmove.cmd.angles, pmove.angles);
// set onground, watertype, and waterlevel // set onground, watertype, and waterlevel
PM_CatagorizePosition (); PM_CategorizePosition ();
if (waterlevel == 2) if (waterlevel == 2)
CheckWaterJump (); CheckWaterJump ();
@ -952,6 +970,6 @@ void PlayerMove (void)
PM_AirMove (); PM_AirMove ();
// set onground, watertype, and waterlevel for final spot // set onground, watertype, and waterlevel for final spot
PM_CatagorizePosition (); PM_CategorizePosition ();
} }