diff --git a/src/g_game.c b/src/g_game.c index 83531bb35..9f2d05ff0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -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. diff --git a/src/r_skins.c b/src/r_skins.c index f67f2afd4..c734b6001 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -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)