thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-05 22:42:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix instances of things still using (options >> ZSHIFT)

Browse source
This commit is contained in:
Sally Coolatta 2020-09-27 04:22:09 -04:00
parent 72672d68cf
commit 857f295836
3 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_battle.c
View file

@ -594,18 +594,14 @@ void K_SpawnBattleCapsules(void)
z = P_GetZAt(sec->c_slope, x, y, sec->ceilingheight) - mobjinfo[MT_BATTLECAPSULE].height;
floorheights[0] = z;
if (mt->options >> ZSHIFT)
z -= ((mt->options >> ZSHIFT) << FRACBITS);
z -= (mt->z << FRACBITS);
}
else
{
z = P_GetZAt(sec->f_slope, x, y, sec->floorheight);
floorheights[0] = z;
if (mt->options >> ZSHIFT)
z += ((mt->options >> ZSHIFT) << FRACBITS);
z += (mt->z << FRACBITS);
}

2
src/k_respawn.c
View file

@ -186,7 +186,7 @@ void K_DoIngameRespawn(player_t *player)
else
{
sector_t *s;
fixed_t z = (beststart->options >> ZSHIFT) * FRACUNIT;
fixed_t z = beststart->z * FRACUNIT;
player->respawn.pointx = beststart->x << FRACBITS;
player->respawn.pointy = beststart->y << FRACBITS;

16
src/slope_anchors.c
View file

@ -118,17 +118,13 @@ anchor_height
const mapthing_t * a,
const sector_t * s
){
if (a->options & MTF_OBJECTFLIP)
{
INT16 z = ( a->options >> ZSHIFT );
if (a->options & MTF_OBJECTFLIP)
{
return ( s->ceilingheight >> FRACBITS ) - z;
}
else
{
return ( s->floorheight >> FRACBITS ) + z;
}
return ( s->ceilingheight >> FRACBITS ) - a->z;
}
else
{
return ( s->floorheight >> FRACBITS ) + a->z;
}
}