summaryrefslogtreecommitdiff
path: root/src/game/bg_pmove.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/bg_pmove.c')
-rw-r--r--src/game/bg_pmove.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index f36cd3e3..4c8fe6dc 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -1700,7 +1700,11 @@ static void PM_GroundTrace( void ) {
point[1] = pm->ps->origin[1];
point[2] = pm->ps->origin[2] - 0.25;
- pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask);
+ //FIXME: hack until i find out where CONTENTS_BODY is getting unset for uhm.. bodies.
+ if( pm->ps->pm_type == PM_DEAD )
+ pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, MASK_PLAYERSOLID );
+ else
+ pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask);
pml.groundTrace = trace;
// do something corrective if the trace starts in a solid...
@@ -2652,9 +2656,9 @@ void PmoveSingle (pmove_t *pmove)
pm->watertype = 0;
pm->waterlevel = 0;
- if ( pm->ps->stats[STAT_HEALTH] <= 0 ) {
+ /*if ( pm->ps->stats[STAT_HEALTH] <= 0 ) {
pm->tracemask &= ~CONTENTS_BODY; // corpses can fly through bodies
- }
+ }*/
// make sure walking button is clear if they are running, to avoid
// proxy no-footsteps cheats