X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=3701038e76d8f3063378d92364612cdbab798973;hp=5b92f2fc1e6d2d48db394bbf9881d1b60c73b8c4;hb=86d45dd42fd3cf9c183883e4ab1abe5b607e1779;hpb=ad07d68e5caa4042bf2769099460d37c528e246c

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 5b92f2f..3701038 100644
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -2447,6 +2447,7 @@ var
   PID: Word;
   Pl: TPlayer;
   I, OldFire: Integer;
+  checkWeapon: Boolean;
   OldJet, Flam: Boolean;
   NewTeam: Byte;
 begin
@@ -2468,8 +2469,19 @@ begin
     NewTeam := M.ReadByte();
 
     for I := WP_FIRST to WP_LAST do
-      FWeapon[I] := (M.ReadByte() <> 0);
-
+    begin
+      checkWeapon := (M.ReadByte() <> 0);
+      if ( ((PID = gPlayer1.UID) or ( (gPlayer2 <> nil) and (PID = gPlayer2.UID))) and (I <> WEAPON_PISTOL) and (I <> WEAPON_KASTET ) and (gWeaponAutoswitch = True)) then
+      begin
+        if ( (checkWeapon = True) and (FWeapon[I] = False) ) then
+        begin
+          FWeapon[I] := True;
+          if (PID = gPlayer1.UID) then gSelectWeapon[0, I] := True
+          else gSelectWeapon[1, I] := True;
+        end;
+      end;
+      FWeapon[I] := checkWeapon;
+    end;
     for I := A_BULLETS to A_HIGH do
       FAmmo[I] := M.ReadWord();