stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

MI pointed out opportunity for more optimisation, and who could resist?

Browse source
This commit is contained in:
toasterbabe 2016-06-07 18:18:47 +01:00
parent 9df72a966e
commit aa113045d7
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/p_user.c
View file

@ -2960,9 +2960,9 @@ static void P_DoTeeter(player_t *player)
if (checkedforteeter && !teeter) // Backup code if (checkedforteeter && !teeter) // Backup code
{ {
sector_t *sec; sector_t *sec;
fixed_t secfloorheight[4];
fixed_t secceilingheight[4];
UINT8 i; UINT8 i;
fixed_t highestceilingheight = INT32_MIN;
fixed_t lowestfloorheight = INT32_MAX;
teeter = false; teeter = false;
roverfloor = false; roverfloor = false;
@ -2977,14 +2977,16 @@ static void P_DoTeeter(player_t *player)
sec = R_PointInSubsector(checkx, checky)->sector; sec = R_PointInSubsector(checkx, checky)->sector;
secceilingheight[i] = sec->ceilingheight; fixed_t ceilingheight = sec->ceilingheight;
secfloorheight[i] = sec->floorheight; fixed_t floorheight = sec->floorheight;
#ifdef ESLOPE #ifdef ESLOPE
if (sec->c_slope) if (sec->c_slope)
secceilingheight[i] = P_GetZAt(sec->c_slope, checkx, checky); ceilingheight = P_GetZAt(sec->c_slope, checkx, checky);
if (sec->f_slope) if (sec->f_slope)
secfloorheight[i] = P_GetZAt(sec->f_slope, checkx, checky); floorheight = P_GetZAt(sec->f_slope, checkx, checky);
#endif #endif
highestceilingheight = (ceilingheight > highestceilingheight) ? ceilingheight : highestceilingheight;
lowestfloorheight = (floorheight < lowestfloorheight) ? floorheight : lowestfloorheight;
#undef xsign #undef xsign
#undef ysign #undef ysign
@ -3012,12 +3014,12 @@ static void P_DoTeeter(player_t *player)
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
{ {
if (bottomheight > secceilingheight[i]) // Above the ceiling if (bottomheight > ceilingheight) // Above the ceiling
continue; continue;
if (bottomheight > player->mo->z + player->mo->height + tiptop if (bottomheight > player->mo->z + player->mo->height + tiptop
|| (topheight < player->mo->z || (topheight < player->mo->z
&& player->mo->z + player->mo->height < secceilingheight[i] - tiptop)) && player->mo->z + player->mo->height < ceilingheight - tiptop))
{ {
teeter = true; teeter = true;
roverfloor = true; roverfloor = true;
@ -3031,12 +3033,12 @@ static void P_DoTeeter(player_t *player)
} }
else else
{ {
if (topheight < secfloorheight[i]) // Below the floor if (topheight < floorheight) // Below the floor
continue; continue;
if (topheight < player->mo->z - tiptop if (topheight < player->mo->z - tiptop
|| (bottomheight > player->mo->z + player->mo->height || (bottomheight > player->mo->z + player->mo->height
&& player->mo->z > secfloorheight[i] + tiptop)) && player->mo->z > floorheight + tiptop))
{ {
teeter = true; teeter = true;
roverfloor = true; roverfloor = true;
@ -3054,18 +3056,12 @@ static void P_DoTeeter(player_t *player)
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
{ {
if (!teeter && !roverfloor && (secceilingheight[0] > player->mo->ceilingz + tiptop if (!teeter && !roverfloor && (highestceilingheight > player->mo->ceilingz + tiptop))
|| secceilingheight[1] > player->mo->ceilingz + tiptop
|| secceilingheight[2] > player->mo->ceilingz + tiptop
|| secceilingheight[3] > player->mo->ceilingz + tiptop))
teeter = true; teeter = true;
} }
else else
{ {
if (!teeter && !roverfloor && (secfloorheight[0] < player->mo->floorz - tiptop if (!teeter && !roverfloor && (lowestfloorheight < player->mo->floorz - tiptop))
|| secfloorheight[1] < player->mo->floorz - tiptop
|| secfloorheight[2] < player->mo->floorz - tiptop
|| secfloorheight[3] < player->mo->floorz - tiptop))
teeter = true; teeter = true;
} }
} }