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

- add horizAdjust after processing pitch adjustments and call sethorizon() in processinput_d() after dokneeattack().

Browse source 
Fixes #101.
This commit is contained in:
Mitchell Richters 2020-08-05 14:23:07 +10:00
parent 454e0e36c9
commit 9f8d50c0a1
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/games/duke/src/player.cpp
View file

@ -914,6 +914,7 @@ void resetinputhelpers(player_struct* p)
{ {
p->horizAdjust = 0; p->horizAdjust = 0;
p->angAdjust = 0; p->angAdjust = 0;
p->pitchAdjust = 0;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -961,7 +962,7 @@ void sethorizon(int snum, int sb_snum, double factor, bool frominput, fixed_t ad
auto p = &ps[snum]; auto p = &ps[snum];
// Calculate adjustment as true pitch (Fixed point math really sucks...) // Calculate adjustment as true pitch (Fixed point math really sucks...)
double horizAngle = atan2((p->q16horiz + ((factor * p->horizAdjust) * 65536)) - F16(100), F16(128)) * (512. / pi::pi()) + (adjustment / 65536.); double horizAngle = atan2(p->q16horiz - F16(100), F16(128)) * (512. / pi::pi()) + (factor * p->pitchAdjust) + (adjustment / 65536.);
if (p->return_to_center > 0 && (sb_snum & (SKB_LOOK_UP | SKB_LOOK_DOWN)) == 0) // only snap back if no relevant button is pressed. if (p->return_to_center > 0 && (sb_snum & (SKB_LOOK_UP | SKB_LOOK_DOWN)) == 0) // only snap back if no relevant button is pressed.
{ {
@ -981,7 +982,7 @@ void sethorizon(int snum, int sb_snum, double factor, bool frominput, fixed_t ad
} }
} }
p->q16horiz = clamp(F16(100) + xs_CRoundToInt(F16(128) * tan(horizAngle * (pi::pi() / 512.))), F16(HORIZ_MIN), F16(HORIZ_MAX)); p->q16horiz = clamp((F16(100) + xs_CRoundToInt(F16(128) * tan(horizAngle * (pi::pi() / 512.)))) + (factor * (p->horizAdjust * 65536.)), F16(HORIZ_MIN), F16(HORIZ_MAX));
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -1009,7 +1010,7 @@ void playerLookUp(int snum, ESyncBits sb_snum)
if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0) if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0)
{ {
p->return_to_center = 9; p->return_to_center = 9;
p->horizAdjust += (sb_snum & SKB_RUN) ? 12 : 24; p->pitchAdjust += (sb_snum & SKB_RUN) ? 12 : 24;
} }
} }
@ -1021,7 +1022,7 @@ void playerLookDown(int snum, ESyncBits sb_snum)
if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0) if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0)
{ {
p->return_to_center = 9; p->return_to_center = 9;
p->horizAdjust -= (sb_snum & SKB_RUN) ? 12 : 24; p->pitchAdjust -= (sb_snum & SKB_RUN) ? 12 : 24;
} }
} }
@ -1032,7 +1033,7 @@ void playerAimUp(int snum, ESyncBits sb_snum)
OnEvent(EVENT_AIMUP, p->i, snum, -1); OnEvent(EVENT_AIMUP, p->i, snum, -1);
if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0) if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0)
{ {
p->horizAdjust += (sb_snum & SKB_RUN) ? 6 : 12; p->pitchAdjust += (sb_snum & SKB_RUN) ? 6 : 12;
} }
} }
@ -1043,7 +1044,7 @@ void playerAimDown(int snum, ESyncBits sb_snum)
OnEvent(EVENT_AIMDOWN, p->i, snum, -1); OnEvent(EVENT_AIMDOWN, p->i, snum, -1);
if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0) if (GetGameVarID(g_iReturnVarID, p->i, snum) == 0)
{ {
p->horizAdjust -= (sb_snum & SKB_RUN) ? 6 : 12; p->pitchAdjust -= (sb_snum & SKB_RUN) ? 6 : 12;
} }
} }

9
source/games/duke/src/player_d.cpp
View file

@ -3034,11 +3034,6 @@ HORIZONLY:
p->hard_landing--; p->hard_landing--;
} }
if (cl_syncinput)
{
sethorizon(snum, sb_snum, 1, false, sync[snum].q16horz);
}
//Shooting code/changes //Shooting code/changes
if (p->show_empty_weapon > 0) if (p->show_empty_weapon > 0)
@ -3057,6 +3052,10 @@ HORIZONLY:
dokneeattack(snum, pi, { FEM1, FEM2, FEM3, FEM4, FEM5, FEM6, FEM7, FEM8, FEM9, FEM10, PODFEM1, NAKED1, STATUE }); dokneeattack(snum, pi, { FEM1, FEM2, FEM3, FEM4, FEM5, FEM6, FEM7, FEM8, FEM9, FEM10, PODFEM1, NAKED1, STATUE });
if (cl_syncinput)
{
sethorizon(snum, sb_snum, 1, false, sync[snum].q16horz);
}
if (fi.doincrements(p)) return; if (fi.doincrements(p)) return;

2
source/games/duke/src/types.h
View file

@ -214,7 +214,7 @@ struct player_struct
int8_t crouch_toggle; int8_t crouch_toggle;
// input stuff. // input stuff.
int horizAdjust, angAdjust; int horizAdjust, angAdjust, pitchAdjust;
bool lookLeft, lookRight; bool lookLeft, lookRight;