Manually merge EDuke32 SVN commit 8617.

This commit is contained in:
Mitchell Richters 2020-03-18 10:23:52 +11:00 committed by Christoph Oelckers
parent 15a362f9ac
commit 029b0bbb45

View file

@ -3260,10 +3260,10 @@ void P_GetInput(int const playerNum)
if (!localInput.svel) if (!localInput.svel)
{ {
if (buttonMap.ButtonDown(gamefunc_Turn_Left) && !(pPlayer->movement_lock & 4) && !localInput.svel) if (buttonMap.ButtonDown(gamefunc_Turn_Left) && !(pPlayer->movement_lock & 4) && !localInput.svel)
input.svel = -keyMove; input.svel = keyMove;
if (buttonMap.ButtonDown(gamefunc_Turn_Right) && !(pPlayer->movement_lock & 8) && !localInput.svel) if (buttonMap.ButtonDown(gamefunc_Turn_Right) && !(pPlayer->movement_lock & 8) && !localInput.svel)
input.svel = keyMove; input.svel = -keyMove;
} }
} }
else else
@ -4246,10 +4246,10 @@ void P_DHGetInput(int const playerNum)
if (!localInput.svel) if (!localInput.svel)
{ {
if (buttonMap.ButtonDown(gamefunc_Turn_Left) && !(pPlayer->movement_lock & 4) && !localInput.svel) if (buttonMap.ButtonDown(gamefunc_Turn_Left) && !(pPlayer->movement_lock & 4) && !localInput.svel)
input.svel = -keyMove; input.svel = keyMove;
if (buttonMap.ButtonDown(gamefunc_Turn_Right) && !(pPlayer->movement_lock & 8) && !localInput.svel) if (buttonMap.ButtonDown(gamefunc_Turn_Right) && !(pPlayer->movement_lock & 8) && !localInput.svel)
input.svel = keyMove; input.svel = -keyMove;
} }
} }
else else