mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
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:
commit
b9c372312e
1 changed files with 0 additions and 2 deletions
|
|
@ -1958,9 +1958,7 @@ static void P_3dMovement(player_t *player)
|
||||||
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
|
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
|
||||||
player->cmomx = player->cmomy = 0;
|
player->cmomx = player->cmomy = 0;
|
||||||
else if (player->onconveyor != 2 && player->onconveyor != 4
|
else if (player->onconveyor != 2 && player->onconveyor != 4
|
||||||
#ifdef POLYOBJECTS
|
|
||||||
&& player->onconveyor != 1
|
&& player->onconveyor != 1
|
||||||
#endif
|
|
||||||
)
|
)
|
||||||
player->cmomx = player->cmomy = 0;
|
player->cmomx = player->cmomy = 0;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue