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

Merge branch 'doubly-scaled-floating-rings' into 'master'

Browse source 
Fix rings not floating high enough in mobjscaled maps

See merge request KartKrew/Kart!378
This commit is contained in:
Sal 2021-02-13 08:41:16 -05:00
commit 2dfe9cc9eb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.c
View file

@ -10724,7 +10724,7 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
case MT_YELLOWHORIZ: case MT_YELLOWHORIZ:
case MT_REDHORIZ: case MT_REDHORIZ:
case MT_BLUEHORIZ: case MT_BLUEHORIZ:
offset += mthing->options & MTF_AMBUSH ? 16*mapobjectscale : 0; offset += mthing->options & MTF_AMBUSH ? 16*FRACUNIT : 0;
break; break;
// Ring-like items, may float additional units with MTF_AMBUSH. // Ring-like items, may float additional units with MTF_AMBUSH.
@ -10732,7 +10732,7 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
case MT_EMBLEM: case MT_EMBLEM:
case MT_RING: case MT_RING:
case MT_BLUESPHERE: case MT_BLUESPHERE:
offset += mthing->options & MTF_AMBUSH ? 24*mapobjectscale : 0; offset += mthing->options & MTF_AMBUSH ? 24*FRACUNIT : 0;
break; break;
// This object does not have an offset // This object does not have an offset