stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

ri# mified: src/tazx# mofied: src/tazx# modified: src/tazx# modified: src/tazxc

Browse source
This commit is contained in:
CobaltBW 2021-06-29 13:30:10 -07:00 committed by CobaltBW
parent 09f445f227
commit c3fa9bea0f
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_game.c
View file

@ -2317,16 +2317,13 @@ void G_Ticker(boolean run)
P_ForceLocalAngle(&players[i], players[i].angleturn << 16);
else
players[i].cmd.angleturn = players[i].angleturn;
players[i].angleturn += players[i].cmd.angleturn - players[i].oldrelangleturn;
players[i].oldrelangleturn = players[i].cmd.angleturn;
if (P_ControlStyle(&players[i]) == CS_LMAOGALOG)
P_ForceLocalAngle(&players[i], players[i].angleturn << 16);
else
players[i].cmd.angleturn = players[i].angleturn;
players[i].cmd.angleturn &= ~TICCMD_RECEIVED;
// Use the leveltime sent in the player's ticcmd to determine control lag
// Use the leveltime sent in the player's ticcmd to determine control lag
players[i].cmd.latency = min(((leveltime & 0xFF) - players[i].cmd.latency) & 0xFF, MAXPREDICTTICS-1);
}
else // Less work is required if we're building a bot ticcmd.

1
src/r_skins.c
View file

@ -286,7 +286,6 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum)
// We want to check our global unlockables.
return (unlockables[unlockID].unlocked);
}
>>>>>>> src/r_skins.c
}
// returns true if the skin name is found (loaded from pwad)