rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-27 14:32:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

changes to gravity and stuff

Browse source
This commit is contained in:
Bryce Hutchings 2002-07-08 04:34:15 +00:00
parent 3e76722f5c
commit 87b9648e74
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reaction/game/bg_pmove.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.83 2002/07/08 04:34:15 niceass
// changes to gravity and stuff
//
// Revision 1.82 2002/06/29 02:50:58 niceass // Revision 1.82 2002/06/29 02:50:58 niceass
// m4 kick fix and removed ladder stuff // m4 kick fix and removed ladder stuff
// //
@ -712,10 +715,12 @@ static void PM_AirMove(void)
// project moves down to flat plane // project moves down to flat plane
/* REMOVED. WAS IN 2.0.
pml.forward[2] = 0; pml.forward[2] = 0;
pml.right[2] = 0; pml.right[2] = 0;
VectorNormalize(pml.forward); VectorNormalize(pml.forward);
VectorNormalize(pml.right); VectorNormalize(pml.right);
*/
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
wishvel[i] = pml.forward[i] * fmove * scale + pml.right[i] * smove * scale; wishvel[i] = pml.forward[i] * fmove * scale + pml.right[i] * smove * scale;
@ -737,6 +742,7 @@ static void PM_AirMove(void)
pm->ps->velocity, OVERCLIP ); pm->ps->velocity, OVERCLIP );
} }
*/ */
pm->ps->velocity[2] -= pm->ps->gravity * pml.frametime;
PM_StepSlideMove(qtrue); PM_StepSlideMove(qtrue);
} }
@ -814,10 +820,10 @@ static void PM_WalkMove(void)
// project the forward and right directions onto the ground plane // project the forward and right directions onto the ground plane
pml.forward[2] = 0; pml.forward[2] = 0;
pml.right[2] = 0; pml.right[2] = 0;
PM_ClipVelocity(pml.forward, pml.groundTrace.plane.normal, pml.forward, OVERCLIP); PM_ClipVelocity(pml.forward, pml.groundTrace.plane.normal, pml.forward, OVERCLIP);
PM_ClipVelocity(pml.right, pml.groundTrace.plane.normal, pml.right, OVERCLIP); PM_ClipVelocity(pml.right, pml.groundTrace.plane.normal, pml.right, OVERCLIP);
//
VectorNormalize(pml.forward); VectorNormalize(pml.forward);
VectorNormalize(pml.right); VectorNormalize(pml.right);
@ -825,7 +831,8 @@ static void PM_WalkMove(void)
wishvel[i] = pml.forward[i] * fmove + pml.right[i] * smove; wishvel[i] = pml.forward[i] * fmove + pml.right[i] * smove;
} }
// when going up or down slopes the wish velocity should Not be zero // when going up or down slopes the wish velocity should Not be zero
// wishvel[2] = 0; // NiceAss: Changed from 2.0. Was commented out.
wishvel[2] = 0;
VectorCopy(wishvel, wishdir); VectorCopy(wishvel, wishdir);
wishspeed = VectorNormalize(wishdir); wishspeed = VectorNormalize(wishdir);
@ -855,14 +862,20 @@ static void PM_WalkMove(void)
accelerate = pm_accelerate; accelerate = pm_accelerate;
} }
// NiceAss: Changed from 2.0. Wasn't here before.
if (pm->ps->velocity[2] < 0)
pm->ps->velocity[2] = 0;
PM_Accelerate(wishdir, wishspeed, accelerate); PM_Accelerate(wishdir, wishspeed, accelerate);
if (pm->ps->velocity[2] < 0) if (pm->ps->velocity[2] < 0)
pm->ps->velocity[2] = 0; pm->ps->velocity[2] = 0;
if ((pml.groundTrace.surfaceFlags & SURF_SLICK) || pm->ps->pm_flags & PMF_TIME_KNOCKBACK) { if ((pml.groundTrace.surfaceFlags & SURF_SLICK) || pm->ps->pm_flags & PMF_TIME_KNOCKBACK) {
pm->ps->velocity[2] -= pm->ps->gravity * pml.frametime; pm->ps->velocity[2] -= pm->ps->gravity * pml.frametime;
} }
// don't do anything if standing still // don't do anything if standing still
if (!pm->ps->velocity[0] && !pm->ps->velocity[1]) { if (!pm->ps->velocity[0] && !pm->ps->velocity[1]) {
return; return;
@ -1239,6 +1252,7 @@ static void PM_GroundTrace(void)
pml.walking = qfalse; pml.walking = qfalse;
return; return;
} }
// check if getting thrown off the ground // check if getting thrown off the ground
/* /*
// NiceAss: Comment out and you get double jumping =D // NiceAss: Comment out and you get double jumping =D
@ -1258,16 +1272,17 @@ static void PM_GroundTrace(void)
} }
*/ */
if (pm->ps->velocity[2] > 180) { // NiceAss: This is here for slope acceleration! if (pm->ps->velocity[2] > 160) { // NiceAss: This is here for slope acceleration!
if (pm->debugLevel) { if (pm->debugLevel) {
Com_Printf("%i:slopeslide\n", c_pmove); Com_Printf("%i:slopeslide\n", c_pmove);
} }
pml.groundPlane = qfalse; pml.groundPlane = qfalse;
pm->ps->groundEntityNum = ENTITYNUM_NONE; pm->ps->groundEntityNum = ENTITYNUM_NONE;
//pml.walking = qfalse; // Maybe not needed? pml.walking = qfalse;
return; return;
} }
// slopes that are too steep will not be considered onground // slopes that are too steep will not be considered onground
// Elder: added ladder check // Elder: added ladder check
if (trace.plane.normal[2] < MIN_WALK_NORMAL && !pml.ladder) { if (trace.plane.normal[2] < MIN_WALK_NORMAL && !pml.ladder) {