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 'checkpoint-gravflip' into 'master'

Browse source 
Position checkpoint parts correctly in reverse gravity

See merge request kart-krew-dev/ring-racers-internal!2799
This commit is contained in:
Gunla 2025-09-08 01:16:43 +00:00 • committed by GitLab
commit 65f68d9e9c
No known key found for this signature in database
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/objects/checkpoint.cpp
View file

@ -323,6 +323,11 @@ private:
arm()->angle = angle - ANGLE_90; arm()->angle = angle - ANGLE_90;
arm()->rollangle = -(ANGLE_90) + pivot(); arm()->rollangle = -(ANGLE_90) + pivot();
if (arm()->eflags & MFE_VERTICALFLIP)
{
arm()->rollangle = InvAngle(arm()->rollangle);
}
} }
void pull() void pull()
@ -337,8 +342,18 @@ private:
P_GetMobjHead(this) + (FixedMul(r, FSIN(pivot())) * P_MobjFlip(this)) P_GetMobjHead(this) + (FixedMul(r, FSIN(pivot())) * P_MobjFlip(this))
); );
if (orb()->eflags & MFE_VERTICALFLIP)
{
orb()->z -= orb()->height;
}
P_MoveOrigin(arm(), orb()->x, orb()->y, orb()->z); P_MoveOrigin(arm(), orb()->x, orb()->y, orb()->z);
if (arm()->eflags & MFE_VERTICALFLIP)
{
arm()->z += orb()->height - arm()->height;
}
if (speed()) if (speed())
{ {
orb()->afterimages(); orb()->afterimages();

5
src/p_mobj.c
View file

@ -14583,6 +14583,11 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
} }
case MT_CHECKPOINT_END: case MT_CHECKPOINT_END:
{ {
if (mthing->options & MTF_OBJECTFLIP)
{
mobj->eflags |= MFE_VERTICALFLIP;
mobj->flags2 |= MF2_OBJECTFLIP;
}
Obj_LinkCheckpoint(mobj); Obj_LinkCheckpoint(mobj);
break; break;
} }