zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-16 12:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Duke3D: Fix hard landing from preventing vertical mouse movement with player input tied to frame-rate.

Browse source
This commit is contained in:
Mitchell Richters 2020-05-07 19:14:01 +10:00 committed by Christoph Oelckers
parent 2e3bcdadd6
commit 6dcd83b734
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/duke3d/src/player.cpp
View file

@ -3322,6 +3322,21 @@ void P_GetInput(int const playerNum)
} }
} }
if (pPlayer->return_to_center > 0)
pPlayer->return_to_center--;
if (pPlayer->hard_landing)
{
pPlayer->return_to_center = 9;
thisPlayer.horizRecenter = true;
}
if (pPlayer->hard_landing > 0)
{
thisPlayer.horizSkew = fix16_from_int(-(pPlayer->hard_landing << 4));
pPlayer->hard_landing--;
}
// A horiz diff of 128 equal 45 degrees, so we convert horiz to 1024 angle units // A horiz diff of 128 equal 45 degrees, so we convert horiz to 1024 angle units
if (thisPlayer.horizAngleAdjust) if (thisPlayer.horizAngleAdjust)
@ -5697,10 +5712,7 @@ RECHECK:
G_ActivateBySector(pPlayer->cursectnum, pPlayer->i); G_ActivateBySector(pPlayer->cursectnum, pPlayer->i);
} }
if (pPlayer->return_to_center > 0) if (TEST_SYNC_KEY(playerBits, SK_CENTER_VIEW))
pPlayer->return_to_center--;
if (TEST_SYNC_KEY(playerBits, SK_CENTER_VIEW) || pPlayer->hard_landing)
if (VM_OnEvent(EVENT_RETURNTOCENTER, pPlayer->i,playerNum) == 0) if (VM_OnEvent(EVENT_RETURNTOCENTER, pPlayer->i,playerNum) == 0)
{ {
pPlayer->return_to_center = 9; pPlayer->return_to_center = 9;
@ -5745,12 +5757,6 @@ RECHECK:
} }
} }
if (pPlayer->hard_landing > 0)
{
thisPlayer.horizSkew = fix16_from_int(-(pPlayer->hard_landing << 4));
pPlayer->hard_landing--;
}
//Shooting code/changes //Shooting code/changes
if (pPlayer->show_empty_weapon > 0) if (pPlayer->show_empty_weapon > 0)