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

- apply same RR horizon workaround from e474ebc2b7 for when cl_syncinput 1 is set for angle as well.

Browse source
This commit is contained in:
Mitchell Richters 2020-08-03 22:31:44 +10:00
parent 19e4393a4f
commit 1556e80dd2
1 changed files with 48 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
source/games/duke/src/player_r.cpp
View file

@ -1410,11 +1410,28 @@ int doincrements_r(struct player_struct* p)
else if (p->knuckle_incs == 22 || PlayerInput(snum, SKB_FIRE))
p->knuckle_incs = 0;
// Originally, this was called before this function in processinput_r(), however with unsynchronised input changes,
// we need to call sethorizon() after calling processweapon(), which happens after this function is called.
// Since this function returning 1 causes processinput_r() to return, we call sethorizon() here in the event this function will return 1.
// Originally, these functions were called before this function in processinput_r(), however with unsynchronised input changes,
// we need to call them after calling processweapon(), which happens after this function is called.
// Since this function returning 1 causes processinput_r() to return, we call them here in the event this function will return 1.
if (cl_syncinput)
{
{
if (!movementBlocked(snum))
{
auto sb_avel = PlayerInputAngVel(snum);
if (sector[p->cursectnum].lotag == ST_2_UNDERWATER)
{
p->q16angvel = (sb_avel - (sb_avel >> 3)) * sgn(TICSPERFRAME);
}
else
{
p->q16angvel = sb_avel * sgn(TICSPERFRAME);
}
applylook(snum, 1, p->q16angvel);
p->crack_time = 777;
}
sethorizon(snum, PlayerInputBits(snum, SKB_ALL), 1, !cl_syncinput, sync[snum].q16horz);
}
@ -3692,34 +3709,6 @@ void processinput_r(int snum)
movement(snum, sb_snum, psect, fz, cz, shrunk, truefdist);
}
//Do the quick lefts and rights
if (movementBlocked(snum))
{
doubvel = 0;
p->posxv = 0;
p->posyv = 0;
}
else if (cl_syncinput)
{
//p->ang += syncangvel * constant
//ENGINE calculates angvel for you
// may still be needed later for demo recording
if (psectlotag == ST_2_UNDERWATER)
{
p->q16angvel = (sb_avel - (sb_avel >> 3)) * sgn(doubvel);
}
else
{
p->q16angvel = sb_avel * sgn(doubvel);
}
applylook(snum, 1, p->q16angvel);
p->crack_time = 777;
}
if (p->spritebridge == 0)
{
j = sector[s->sectnum].floorpicnum;
@ -4111,6 +4100,33 @@ HORIZONLY:
processweapon(snum, sb_snum, psect);
//Do the quick lefts and rights
if (movementBlocked(snum))
{
doubvel = 0;
p->posxv = 0;
p->posyv = 0;
}
else if (cl_syncinput)
{
//p->ang += syncangvel * constant
//ENGINE calculates angvel for you
// may still be needed later for demo recording
if (psectlotag == ST_2_UNDERWATER)
{
p->q16angvel = (sb_avel - (sb_avel >> 3)) * sgn(doubvel);
}
else
{
p->q16angvel = sb_avel * sgn(doubvel);
}
applylook(snum, 1, p->q16angvel);
p->crack_time = 777;
}
if (cl_syncinput)
{
sethorizon(snum, sb_snum, 1, !cl_syncinput, sync[snum].q16horz);