lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Handled some of MI's concerns.

Browse source
This commit is contained in:
toasterbabe 2017-04-04 16:50:33 +01:00
parent caeb515783
commit d5575669fa
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_mobj.c
View file

@ -2541,6 +2541,9 @@ boolean P_CheckDeathPitCollide(mobj_t *mo)
I_Assert(mo != NULL); I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
if (mo->player && mo->player->pflags & PF_GODMODE)
return false;
if (((mo->z <= mo->subsector->sector->floorheight if (((mo->z <= mo->subsector->sector->floorheight
&& !(mo->eflags & MFE_VERTICALFLIP) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_FLOOR)) && !(mo->eflags & MFE_VERTICALFLIP) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_FLOOR))
|| (mo->z + mo->height >= mo->subsector->sector->ceilingheight || (mo->z + mo->height >= mo->subsector->sector->ceilingheight

12
src/st_stuff.c
View file

@ -1490,25 +1490,25 @@ static inline void ST_drawRaceHUD(void)
{ {
INT32 height = (BASEVIDHEIGHT/2); INT32 height = (BASEVIDHEIGHT/2);
INT32 bounce = (leveltime % TICRATE); INT32 bounce = (leveltime % TICRATE);
patch_t **racenum; patch_t *racenum;
switch (leveltime/TICRATE) switch (leveltime/TICRATE)
{ {
case 1: case 1:
racenum = &race3; racenum = race3;
break; break;
case 2: case 2:
racenum = &race2; racenum = race2;
break; break;
case 3: case 3:
racenum = &race1; racenum = race1;
break; break;
default: default:
racenum = &racego; racenum = racego;
break; break;
} }
if (bounce < 3) if (bounce < 3)
height -= (2 - bounce); height -= (2 - bounce);
V_DrawScaledPatch(SCX((BASEVIDWIDTH - SHORT((*racenum)->width))/2), (INT32)(SCY(height)), V_NOSCALESTART, *racenum); V_DrawScaledPatch(SCX((BASEVIDWIDTH - SHORT(racenum->width))/2), (INT32)(SCY(height)), V_NOSCALESTART, racenum);
} }
if (circuitmap) if (circuitmap)