Merge branch 'fixmovingpolyobjectplatforms' into 'master'

Remove erroneous define breaking PolyObject player carrying

Closes #197

See merge request KartKrew/RingRacers!97
This commit is contained in:
Eidolon 2025-03-10 08:01:15 +00:00
commit b9c372312e

View file

@ -1958,9 +1958,7 @@ static void P_3dMovement(player_t *player)
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
player->cmomx = player->cmomy = 0;
else if (player->onconveyor != 2 && player->onconveyor != 4
#ifdef POLYOBJECTS
&& player->onconveyor != 1
#endif
)
player->cmomx = player->cmomy = 0;