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

Merge branch 'float-in-mobjscale' into 'master'

Browse source 
Rings float height is not mobjscaled!

See merge request KartKrew/Kart!295
This commit is contained in:
Sryder 2020-07-14 07:54:29 -04:00
commit f1ba06351c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.c
View file

@ -11750,8 +11750,8 @@ void P_RespawnSpecials(void)
ss->sector->ceilingheight) - (mthing->options >> ZSHIFT) * FRACUNIT;
if (mthing->options & MTF_AMBUSH
&& (i == MT_RING || i == MT_REDTEAMRING || i == MT_BLUETEAMRING || i == MT_COIN || P_WeaponOrPanel(i)))
z -= 24*FRACUNIT;
z -= mobjinfo[i].height; // Don't forget the height!
z -= 24 * mapobjectscale;
z -= FixedMul(mobjinfo[i].height, mapobjectscale); // Don't forget the height!
}
else
{
@ -11762,7 +11762,7 @@ void P_RespawnSpecials(void)
ss->sector->floorheight) + (mthing->options >> ZSHIFT) * FRACUNIT;
if (mthing->options & MTF_AMBUSH
&& (i == MT_RING || i == MT_REDTEAMRING || i == MT_BLUETEAMRING || i == MT_COIN || P_WeaponOrPanel(i)))
z += 24*FRACUNIT;
z += 24 * mapobjectscale;
}
mo = P_SpawnMobj(x, y, z, i);