Fix preferences sync

[d2df-sdl.git] / src / game / g_netmsg.pas

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 55b99b3705acbc0ddbe05e00b04ba3657ea2c9fd..8b42846dd97d6dbc254b2639aefdc7847d615848 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -383,6 +383,7 @@ var
   WeapSwitch: Byte;
   TmpPrefArray: Array [WP_FIRST .. WP_LAST + 1] of Byte;
   SwitchEmpty: Byte;
+  SkipF: Byte;
   PID: Word;
   Color: TRGB;
   I: Integer;
@@ -399,10 +400,10 @@ begin
     B := M.ReadByte();
     T := M.ReadByte();
     WeapSwitch := M.ReadByte();
-    if (WeapSwitch = 2) then
-      for I := WP_FIRST to WP_LAST + 1 do
-        TmpPrefArray[I] := M.ReadByte();
+    for I := WP_FIRST to WP_LAST + 1 do
+      TmpPrefArray[I] := M.ReadByte();
     SwitchEmpty := M.ReadByte();
+    SkipF := M.ReadByte();
   except
     Err := True;
   end;
@@ -459,9 +460,9 @@ begin
   begin
     Name := PName;
     WeapSwitchMode := WeapSwitch;
-    if (WeapSwitch = 2) then
-      SetWeaponPrefs(TmpPrefArray);
+    SetWeaponPrefs(TmpPrefArray);
     SwitchToEmpty := SwitchEmpty;
+    SkipFist := SkipF;
     Reset(True);
   end;
 
@@ -715,6 +716,7 @@ var
   TmpWeapSwitch: Byte;
   TmpPrefArray: Array [WP_FIRST .. WP_LAST + 1] of Byte;
   TmpSwEmpty: Byte;
+  TmpSkipF: Byte;
   I: Integer;
   Pl: TPlayer;
   Err: Boolean;
@@ -728,10 +730,10 @@ begin
     TmpColor.B := M.ReadByte();
     TmpTeam := M.ReadByte();
     TmpWeapSwitch := M.ReadByte();
-    if (TmpWeapSwitch = 2) then
-      for I := WP_FIRST to WP_LAST + 1 do
-        TmpPrefArray[I] := M.ReadByte();
+    for I := WP_FIRST to WP_LAST + 1 do
+      TmpPrefArray[I] := M.ReadByte();
     TmpSwEmpty := M.ReadByte();
+    TmpSkipF := M.ReadByte();
   except
     Err := True;
   end;
@@ -758,11 +760,13 @@ begin
   if (TmpWeapSwitch <> Pl.WeapSwitchMode) then
     Pl.WeapSwitchMode := TmpWeapSwitch;
 
-  if (TmpWeapSwitch = 2) then
-    Pl.SetWeaponPrefs(TmpPrefArray);
-
+  Pl.SetWeaponPrefs(TmpPrefArray);
   if (TmpSwEmpty <> Pl.SwitchToEmpty) then
     Pl.SwitchToEmpty := TmpSwEmpty;
+
+  if (TmpSkipF <> Pl.SkipFist) then
+    Pl.SkipFist := TmpSkipF;
+
   MH_SEND_PlayerSettings(Pl.UID, TmpModel);
 end;
 
@@ -3155,10 +3159,10 @@ begin
   NetOut.Write(gPlayer1Settings.Color.B);
   NetOut.Write(gPlayer1Settings.Team);
   NetOut.Write(gPlayer1Settings.WeaponSwitch);
-  if (gPlayer1Settings.WeaponSwitch = 2) then
-    for i := WP_FIRST to WP_LAST + 1 do
-      NetOut.Write(gPlayer1Settings.WeaponPreferences[i]);
+  for i := WP_FIRST to WP_LAST + 1 do
+    NetOut.Write(gPlayer1Settings.WeaponPreferences[i]);
   NetOut.Write(gPlayer1Settings.SwitchToEmpty);
+  NetOut.Write(gPlayer1Settings.SkipFist);
 
   g_Net_Client_Send(True, NET_CHAN_SERVICE);
 end;
@@ -3308,10 +3312,11 @@ begin
   NetOut.Write(gPlayer1Settings.Color.B);
   NetOut.Write(gPlayer1Settings.Team);
   NetOut.Write(gPlayer1Settings.WeaponSwitch);
-  if (gPlayer1Settings.WeaponSwitch = 2) then
-    for i := WP_FIRST to WP_LAST + 1 do
-      NetOut.Write(gPlayer1Settings.WeaponPreferences[i]);
+  for i := WP_FIRST to WP_LAST + 1 do
+    NetOut.Write(gPlayer1Settings.WeaponPreferences[i]);
   NetOut.Write(gPlayer1Settings.SwitchToEmpty);
+  NetOut.Write(gPlayer1Settings.SkipFist);
+
   g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
 end;