From 3d0daf220282bf88673894d42b537e1a6a21c3ee Mon Sep 17 00:00:00 2001
From: Louis-Antoine <lamr@free.fr>
Date: Mon, 29 Oct 2018 00:49:23 +0100
Subject: [PATCH] Fix desynch when toggling analog mode or flipcam Special
thanks to Lat' for asking weird questions
---
src/d_clisrv.c | 12 ------------
src/d_netcmd.c | 8 ++++----
src/g_game.c | 10 ----------
src/r_main.c | 10 ----------
4 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7d0e44b45b..fc80e56b42 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3097,12 +3097,6 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
displayplayer = newplayernum;
secondarydisplayplayer = newplayernum;
DEBFILE("spawning me\n");
- // Apply player flags as soon as possible!
- players[newplayernum].pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
- if (cv_flipcam.value)
- players[newplayernum].pflags |= PF_FLIPCAM;
- if (cv_analog.value)
- players[newplayernum].pflags |= PF_ANALOGMODE;
}
else
{
@@ -3110,12 +3104,6 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
DEBFILE("spawning my brother\n");
if (botingame)
players[newplayernum].bot = 1;
- // Same goes for player 2 when relevant
- players[newplayernum].pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
- if (cv_flipcam2.value)
- players[newplayernum].pflags |= PF_FLIPCAM;
- if (cv_analog2.value)
- players[newplayernum].pflags |= PF_ANALOGMODE;
}
D_SendPlayerConfig();
addedtogame = true;
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 673d64fd82..e4ac8d9b82 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1369,9 +1369,9 @@ void SendWeaponPref(void)
XBOXSTATIC UINT8 buf[1];
buf[0] = 0;
- if (players[consoleplayer].pflags & PF_FLIPCAM)
+ if (cv_flipcam.value)
buf[0] |= 1;
- if (players[consoleplayer].pflags & PF_ANALOGMODE)
+ if (cv_analog.value)
buf[0] |= 2;
SendNetXCmd(XD_WEAPONPREF, buf, 1);
}
@@ -1381,9 +1381,9 @@ void SendWeaponPref2(void)
XBOXSTATIC UINT8 buf[1];
buf[0] = 0;
- if (players[secondarydisplayplayer].pflags & PF_FLIPCAM)
+ if (cv_flipcam2.value)
buf[0] |= 1;
- if (players[secondarydisplayplayer].pflags & PF_ANALOGMODE)
+ if (cv_analog2.value)
buf[0] |= 2;
SendNetXCmd2(XD_WEAPONPREF, buf, 1);
}
diff --git a/src/g_game.c b/src/g_game.c
index d3c55e0cce..e2f35ad134 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1575,11 +1575,6 @@ static void Analog_OnChange(void)
return;
}
- if (cv_analog.value)
- players[consoleplayer].pflags |= PF_ANALOGMODE;
- else
- players[consoleplayer].pflags &= ~PF_ANALOGMODE;
-
SendWeaponPref();
}
@@ -1600,11 +1595,6 @@ static void Analog2_OnChange(void)
return;
}
- if (cv_analog2.value)
- players[secondarydisplayplayer].pflags |= PF_ANALOGMODE;
- else
- players[secondarydisplayplayer].pflags &= ~PF_ANALOGMODE;
-
SendWeaponPref2();
}
diff --git a/src/r_main.c b/src/r_main.c
index e50e800130..7d5d169942 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -222,21 +222,11 @@ static void ChaseCam2_OnChange(void)
static void FlipCam_OnChange(void)
{
- if (cv_flipcam.value)
- players[consoleplayer].pflags |= PF_FLIPCAM;
- else
- players[consoleplayer].pflags &= ~PF_FLIPCAM;
-
SendWeaponPref();
}
static void FlipCam2_OnChange(void)
{
- if (cv_flipcam2.value)
- players[secondarydisplayplayer].pflags |= PF_FLIPCAM;
- else
- players[secondarydisplayplayer].pflags &= ~PF_FLIPCAM;
-
SendWeaponPref2();
}
--
GitLab