zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 4bc105ec07.
This commit is contained in:
Mitchell Richters 2020-05-10 17:06:20 +10:00 committed by Christoph Oelckers
parent d088795f28
commit c7d3753c2b
1 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
source/rr/src/player.cpp
View file

@ -3505,21 +3505,6 @@ 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
if (thisPlayer.horizAngleAdjust)
@ -4182,21 +4167,6 @@ void P_DHGetInput(int const playerNum)
if (pPlayer->cursectnum >= 0 && sector[pPlayer->cursectnum].hitag == 2003)
input.fvel >>= 1;
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
if (thisPlayer.horizAngleAdjust)
@ -8775,7 +8745,10 @@ HORIZONLY:;
}
}
if (TEST_SYNC_KEY(playerBits, SK_CENTER_VIEW))
if (pPlayer->return_to_center > 0)
pPlayer->return_to_center--;
if (TEST_SYNC_KEY(playerBits, SK_CENTER_VIEW) || pPlayer->hard_landing)
if (VM_OnEvent(EVENT_RETURNTOCENTER, pPlayer->i,playerNum) == 0)
{
pPlayer->return_to_center = 9;
@ -8824,6 +8797,12 @@ HORIZONLY:;
pPlayer->q16horiz -= F16(delta);
}
if (pPlayer->hard_landing > 0)
{
thisPlayer.horizSkew = fix16_from_int(-(pPlayer->hard_landing << 4));
pPlayer->hard_landing--;
}
//Shooting code/changes
if (pPlayer->show_empty_weapon > 0)
@ -9419,7 +9398,10 @@ void P_DHProcessInput(int playerNum)
A_GetFurthestAngle(pPlayer->i, 8) < 512);
}
if (TEST_SYNC_KEY(playerBits, SK_CENTER_VIEW))
if (pPlayer->return_to_center > 0)
pPlayer->return_to_center--;
if (TEST_SYNC_KEY(playerBits, SK_CENTER_VIEW) || pPlayer->hard_landing)
{
pPlayer->return_to_center = 9;
thisPlayer.horizRecenter = true;
@ -9455,6 +9437,12 @@ void P_DHProcessInput(int playerNum)
pPlayer->q16horiz -= F16(delta);
}
if (pPlayer->hard_landing > 0)
{
thisPlayer.horizSkew = fix16_from_int(-(pPlayer->hard_landing << 4));
pPlayer->hard_landing--;
}
if (TEST_SYNC_KEY(playerBits, SK_FIRE))
A_DHShoot(playerNum);
}