qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-22 03:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes that don't really affect anything

Browse source
This commit is contained in:
Joseph Carter 2000-05-05 08:55:49 +00:00
parent 85e7890c3b
commit 9c567e579e
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/pmove.c
View file

@ -612,6 +612,7 @@ void PM_AirMove (void)
{
if (pmove.velocity[2] > 0 || !pm_slidefix->value)
pmove.velocity[2] = 0;
PM_Accelerate (wishdir, wishspeed, movevars.accelerate);
pmove.velocity[2] -= movevars.entgravity * movevars.gravity * frametime;
PM_GroundMove ();
@ -631,14 +632,14 @@ void PM_AirMove (void)
PM_CategorizePosition ();
if (onground != -1) // but we're on ground now
{
// Con_Printf ("Jumping bug!\n");
//Con_DPrintf ("Jumping bug!\n");
VectorCopy (pmove.origin, original);
// Calculate correct velocity
PM_FlyMove();
// Restore position
VectorCopy (original, pmove.origin);
}
};
}
}
//Con_Printf("airmove:vec: %4.2f %4.2f %4.2f\n",
@ -833,7 +834,7 @@ void NudgePosition (void)
// pmove.origin[2] += 0.124;
// if (pmove.dead)
// return; // might be a squished point, so don'y bother
// return; // might be a squished point, so don't bother
// if (PM_TestPlayerPosition (pmove.origin) )
// return;

3
qw_server/sv_phys.c
View file

@ -478,7 +478,10 @@ qboolean SV_Push (edict_t *pusher, vec3_t move)
block = SV_TestEntityPosition (check);
pusher->v.solid = SOLID_BSP;
if (block)
{
// Con_Printf ("blocked.. %i\n", block);
continue;
}
// if the entity is standing on the pusher, it will definately be moved
if ( ! ( ((int)check->v.flags & FL_ONGROUND)