X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=a55a8a849d153a29ff46afd7b62f1b95f362d69f;hb=HEAD;hp=36c0aa15e5e293f5a64713e87706577d27149864;hpb=d55f78661cd9bd77609beed2552d7dd6262ad65c;p=d2df-sdl.git

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 36c0aa1..a55a8a8 100644
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -137,6 +137,7 @@ const
 
 // HOST MESSAGES
 
+procedure MH_MalformedPacket(C: pTNetClient);
 procedure MH_ProcessFirstSpawn (C: pTNetClient);
 
 procedure MH_RECV_Info(C: pTNetClient; var M: TMsg);
@@ -336,18 +337,34 @@ end;
 
 // GAME
 
+procedure MH_MalformedPacket(C: pTNetClient);
+begin
+  g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
+    _lc[I_NET_DISC_BADMSG]);
+  g_Net_Host_Ban(C, True);
+end;
+
 procedure MH_RECV_Chat(C: pTNetClient; var M: TMsg);
 var
   Txt: string;
   Mode: Byte;
   PID: Word;
   Pl: TPlayer;
+  Err: Boolean;
 begin
   PID := C^.Player;
   Pl := g_Player_Get(PID);
 
-  Txt := M.ReadString();
-  Mode := M.ReadByte();
+  Err := False;
+  try
+    Txt := M.ReadString();
+    Mode := M.ReadByte();
+  except
+    Err := True;
+  end;
+
+  if Err then begin MH_MalformedPacket(C); Exit; end;
+
   if (Mode = NET_CHAT_SYSTEM) then
     Mode := NET_CHAT_PLAYER; // prevent sending system messages from clients
   if (Mode = NET_CHAT_TEAM) and (not gGameSettings.GameMode in [GM_TDM, GM_CTF]) then
@@ -363,40 +380,57 @@ procedure MH_RECV_Info(C: pTNetClient; var M: TMsg);
 var
   Ver, PName, Model, Pw: string;
   R, G, B, T: Byte;
+  WeapSwitch: Byte;
+  TmpPrefArray: Array [WP_FIRST .. WP_LAST + 1] of Byte;
+  SwitchEmpty: Byte;
+  SkipF: Byte;
   PID: Word;
   Color: TRGB;
   I: Integer;
-begin
-  Ver := M.ReadString();
-  Pw := M.ReadString();
-  PName := M.ReadString();
-  Model := M.ReadString();
-  R := M.ReadByte();
-  G := M.ReadByte();
-  B := M.ReadByte();
-  T := M.ReadByte();
+  Err: Boolean;
+begin
+  Err := False;
+  try
+    Ver := M.ReadString();
+    Pw := M.ReadString();
+    PName := M.ReadString();
+    Model := M.ReadString();
+    R := M.ReadByte();
+    G := M.ReadByte();
+    B := M.ReadByte();
+    T := M.ReadByte();
+    WeapSwitch := 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;
+
+  if Err then begin MH_MalformedPacket(C); Exit; end;
 
   if Ver <> GAME_VERSION then
   begin
     g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
       _lc[I_NET_DISC_VERSION]);
-    enet_peer_disconnect(C^.Peer, NET_DISC_VERSION);
+    g_Net_Host_Kick(C^.ID, NET_DISC_VERSION);
     Exit;
   end;
 
-  if g_Net_IsHostBanned(C^.Peer^.address.host) then
+  if g_Net_IsAddressBanned(C^.Peer^.address.host) then
   begin
-    if g_Net_IsHostBanned(C^.Peer^.address.host, True) then
+    if g_Net_IsAddressBanned(C^.Peer^.address.host, True) then
     begin
       g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
         _lc[I_NET_DISC_BAN]);
-      enet_peer_disconnect(C^.Peer, NET_DISC_BAN);
+      g_Net_Host_Kick(C^.ID, NET_DISC_BAN);
     end
     else
     begin
       g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
         _lc[I_NET_DISC_BAN]);
-      enet_peer_disconnect(C^.Peer, NET_DISC_TEMPBAN);
+      g_Net_Host_Kick(C^.ID, NET_DISC_TEMPBAN);
     end;
     Exit;
   end;
@@ -406,10 +440,17 @@ begin
     begin
       g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
         _lc[I_NET_DISC_PASSWORD]);
-      enet_peer_disconnect(C^.Peer, NET_DISC_PASSWORD);
+      g_Net_Host_Kick(C^.ID, NET_DISC_PASSWORD);
       Exit;
     end;
 
+  if (C^.Player <> 0) then
+  begin
+    // already received info
+    g_Net_Penalize(C, 'client info spam');
+    Exit;
+  end;
+
   Color.R := R;
   Color.B := B;
   Color.G := G;
@@ -418,11 +459,18 @@ begin
   with g_Player_Get(PID) do
   begin
     Name := PName;
+    WeapSwitchMode := WeapSwitch;
+    SetWeaponPrefs(TmpPrefArray);
+    SwitchToEmpty := SwitchEmpty;
+    SkipIronFist := SkipF;
+    if (g_Force_Model_Get() <> 0) then
+      SetModel(g_Forced_Model_GetName());
     Reset(True);
   end;
 
   C^.Player := PID;
   C^.WaitForFirstSpawn := false;
+  C^.AuthTime := 0;
 
   g_Console_Add(Format(_lc[I_PLAYER_JOIN], [PName]), True);
   e_WriteLog('NET: Client ' + PName + ' [' + IntToStr(C^.ID) +
@@ -509,6 +557,14 @@ end;
 procedure MH_RECV_FullStateRequest(C: pTNetClient; var M: TMsg);
 begin
   //e_LogWritefln('*** client #%u (cid #%u) full state request', [C.ID, C.Player]);
+
+  if C^.FullUpdateSent then
+  begin
+    // FullStateRequest spam?
+    g_Net_Penalize(C, 'duplicate full state request');
+    exit;
+  end;
+
   if gGameOn then
   begin
     MH_SEND_Everything((C^.State = NET_STATE_AUTH), C^.ID)
@@ -530,11 +586,20 @@ var
   kByte: Word;
   Pl: TPlayer;
   GT: LongWord;
+  Err: Boolean;
 begin
   Result := 0;
+  Err := False;
   if not gGameOn then Exit;
 
-  GT := M.ReadLongWord();
+  try
+    GT := M.ReadLongWord();
+  except
+    Err := True;
+  end;
+
+  if Err then begin MH_MalformedPacket(C); Exit; end;
+
   PID := C^.Player;
   Pl := g_Player_Get(PID);
   if Pl = nil then
@@ -545,10 +610,17 @@ begin
   with Pl do
   begin
     NetTime := GT;
-    kByte := M.ReadWord();
-    Dir := M.ReadByte();
-    WeaponAct := M.ReadByte();
-    WeaponSelect := M.ReadWord();
+    try
+      kByte := M.ReadWord();
+      Dir := M.ReadByte();
+      WeaponAct := M.ReadByte();
+      WeaponSelect := M.ReadWord();
+    except
+      Err := True;
+    end;
+
+    if Err then begin MH_MalformedPacket(C); Exit; end;
+
     //e_WriteLog(Format('R:ws=%d', [WeaponSelect]), MSG_WARNING);
     if Direction <> TDirection(Dir) then
       JustTeleported := False;
@@ -596,11 +668,19 @@ procedure MH_RECV_CheatRequest(C: pTNetClient; var M: TMsg);
 var
   CheatKind: Byte;
   Pl: TPlayer;
+  Err: Boolean;
 begin
+  Err := False;
   Pl := g_Player_Get(C^.Player);
   if Pl = nil then Exit;
 
-  CheatKind := M.ReadByte();
+  try
+    CheatKind := M.ReadByte();
+  except
+    Err := True;
+  end;
+
+  if Err then begin MH_MalformedPacket(C); Exit; end;
 
   case CheatKind of
     NET_CHEAT_SUICIDE:
@@ -643,14 +723,32 @@ var
   TmpModel: string;
   TmpColor: TRGB;
   TmpTeam: Byte;
+  TmpWeapSwitch: Byte;
+  TmpPrefArray: Array [WP_FIRST .. WP_LAST + 1] of Byte;
+  TmpSwEmpty: Byte;
+  TmpSkipF: Byte;
+  I: Integer;
   Pl: TPlayer;
-begin
-  TmpName := M.ReadString();
-  TmpModel := M.ReadString();
-  TmpColor.R := M.ReadByte();
-  TmpColor.G := M.ReadByte();
-  TmpColor.B := M.ReadByte();
-  TmpTeam := M.ReadByte();
+  Err: Boolean;
+begin
+  Err := False;
+  try
+    TmpName := M.ReadString();
+    TmpModel := M.ReadString();
+    TmpColor.R := M.ReadByte();
+    TmpColor.G := M.ReadByte();
+    TmpColor.B := M.ReadByte();
+    TmpTeam := M.ReadByte();
+    TmpWeapSwitch := 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;
+
+  if Err then begin MH_MalformedPacket(C); Exit; end;
 
   Pl := g_Player_Get(C^.Player);
   if Pl = nil then Exit;
@@ -666,9 +764,21 @@ begin
     Pl.Name := TmpName;
   end;
 
+  if (g_Force_Model_Get() <> 0) then
+    TmpModel := g_Forced_Model_GetName();
   if TmpModel <> Pl.Model.Name then
     Pl.SetModel(TmpModel);
 
+  if (TmpWeapSwitch <> Pl.WeapSwitchMode) then
+    Pl.WeapSwitchMode := TmpWeapSwitch;
+
+  Pl.SetWeaponPrefs(TmpPrefArray);
+  if (TmpSwEmpty <> Pl.SwitchToEmpty) then
+    Pl.SwitchToEmpty := TmpSwEmpty;
+
+  if (TmpSkipF <> Pl.SkipIronFist) then
+    Pl.SkipIronFist := TmpSkipF;
+
   MH_SEND_PlayerSettings(Pl.UID, TmpModel);
 end;
 
@@ -677,8 +787,15 @@ end;
 procedure MH_RECV_RCONPassword(C: pTNetClient; var M: TMsg);
 var
   Pwd: string;
+  Err: Boolean;
 begin
-  Pwd := M.ReadString();
+  Err := False;
+  try
+    Pwd := M.ReadString();
+  except
+    Err := True;
+  end;
+  if Err then begin MH_MalformedPacket(C); Exit; end;
   if not NetAllowRCON then Exit;
   if Pwd = NetRCONPassword then
   begin
@@ -692,8 +809,15 @@ end;
 procedure MH_RECV_RCONCommand(C: pTNetClient; var M: TMsg);
 var
   Cmd: string;
+  Err: Boolean;
 begin
-  Cmd := M.ReadString();
+  Err := False;
+  try
+    Cmd := M.ReadString();
+  except
+    Err := True;
+  end;
+  if Err then begin MH_MalformedPacket(C); Exit; end;
   if not NetAllowRCON then Exit;
   if not C^.RCONAuth then
   begin
@@ -711,9 +835,17 @@ var
   Name, Command: string;
   Need: Integer;
   Pl: TPlayer;
-begin
-  Start := M.ReadByte() <> 0;
-  Command := M.ReadString();
+  Err: Boolean;
+begin
+  Err := False;
+  try
+    Start := M.ReadByte() <> 0;
+    Command := M.ReadString();
+  except
+    Err := True;
+  end;
+
+  if Err then begin MH_MalformedPacket(C); Exit; end;
 
   Pl := g_Player_Get(C^.Player);
   if Pl = nil then Exit;
@@ -774,11 +906,14 @@ procedure MH_SEND_Everything(CreatePlayers: Boolean {= False}; ID: Integer {= NE
 var
   I: Integer;
 begin
-  if (ID >= 0) and (ID < length(NetClients)) then
-  begin
-    e_LogWritefln('*** client #%u (cid #%u) will get everything', [ID, NetClients[ID].Player]);
-    MH_ProcessFirstSpawn(@NetClients[ID]);
-  end;
+  if (ID < 0) or (ID >= Length(NetClients)) then
+    exit; // bogus client, this shouldn't happen
+
+  NetClients[ID].FullUpdateSent := True;
+
+  e_LogWritefln('*** client #%u (cid #%u) will get everything', [ID, NetClients[ID].Player]);
+
+  MH_ProcessFirstSpawn(@NetClients[ID]);
 
   if gPlayers <> nil then
   begin
@@ -851,13 +986,13 @@ begin
   NetOut.Write(g_ExtractFileName(gMapInfo.Map));
   NetOut.Write(gWADHash);
   NetOut.Write(gGameSettings.GameMode);
-  NetOut.Write(gGameSettings.GoalLimit);
+  NetOut.Write(gGameSettings.ScoreLimit);
   NetOut.Write(gGameSettings.TimeLimit);
   NetOut.Write(gGameSettings.MaxLives);
-  NetOut.Write(gGameSettings.Options);
+  NetOut.Write(LongWord(gGameSettings.Options));
   NetOut.Write(gTime);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_SERVICE);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_Chat(Txt: string; Mode: Byte; ID: Integer = NET_EVERYONE);
@@ -879,7 +1014,7 @@ begin
         NetOut.Write(Byte(NET_MSG_CHAT));
         NetOut.Write(Txt);
         NetOut.Write(Mode);
-        g_Net_Host_Send(gPlayers[i].FClientID, True, NET_CHAN_CHAT);
+        g_Net_Host_Send(gPlayers[i].FClientID, True);
       end;
     Team := ID;
     ID := NET_EVERYONE;
@@ -889,7 +1024,7 @@ begin
     NetOut.Write(Byte(NET_MSG_CHAT));
     NetOut.Write(Txt);
     NetOut.Write(Mode);
-    g_Net_Host_Send(ID, True, NET_CHAN_CHAT);
+    g_Net_Host_Send(ID, True);
   end;
 
   if Mode = NET_CHAT_SYSTEM then
@@ -938,7 +1073,7 @@ begin
   NetOut.Write(Y);
   NetOut.Write(Ang);
 
-  g_Net_Host_Send(ID, False, NET_CHAN_GAME);
+  g_Net_Host_Send(ID, False);
 end;
 
 procedure MH_SEND_Sound(X, Y: Integer; Name: string; Pos: Boolean = True; ID: Integer = NET_EVERYONE);
@@ -954,7 +1089,7 @@ begin
   else
     NetOut.Write(Byte(0));
 
-  g_Net_Host_Send(ID, False, NET_CHAN_GAME);
+  g_Net_Host_Send(ID, False);
 end;
 
 procedure MH_SEND_CreateShot(Proj: LongInt; ID: Integer = NET_EVERYONE);
@@ -972,7 +1107,7 @@ begin
   NetOut.Write(Shots[Proj].Obj.Vel.X);
   NetOut.Write(Shots[Proj].Obj.Vel.Y);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_SHOTS);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_UpdateShot(Proj: LongInt; ID: Integer = NET_EVERYONE);
@@ -986,7 +1121,7 @@ begin
   NetOut.Write(Shots[Proj].Obj.Vel.X);
   NetOut.Write(Shots[Proj].Obj.Vel.Y);
 
-  g_Net_Host_Send(ID, False, NET_CHAN_SHOTS);
+  g_Net_Host_Send(ID, False);
 end;
 
 procedure MH_Send_DeleteShot(Proj: LongInt; X, Y: LongInt; Loud: Boolean = True; ID: Integer = NET_EVERYONE);
@@ -997,7 +1132,7 @@ begin
   NetOut.Write(X);
   NetOut.Write(Y);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_SHOTS);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_GameStats(ID: Integer = NET_EVERYONE);
@@ -1005,8 +1140,8 @@ begin
   NetOut.Write(Byte(NET_MSG_SCORE));
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   begin
-    NetOut.Write(gTeamStat[TEAM_RED].Goals);
-    NetOut.Write(gTeamStat[TEAM_BLUE].Goals);
+    NetOut.Write(gTeamStat[TEAM_RED].Score);
+    NetOut.Write(gTeamStat[TEAM_BLUE].Score);
   end
   else
     if gGameSettings.GameMode = GM_COOP then
@@ -1015,7 +1150,7 @@ begin
       NetOut.Write(gCoopSecretsFound);
     end;
 
-  g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_CoopStats(ID: Integer = NET_EVERYONE);
@@ -1044,7 +1179,7 @@ begin
   end else
     NetOut.Write(Byte(0));
 
-  g_Net_Host_Send(ID, True, NET_CHAN_SERVICE);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_FlagEvent(EvType: Byte; Flag: Byte; PID: Word; Quiet: Boolean = False; ID: Integer = NET_EVERYONE);
@@ -1062,7 +1197,7 @@ begin
   NetOut.Write(gFlags[Flag].Obj.Vel.Y);
   NetOut.Write(Byte(gFlags[Flag].Direction));
 
-  g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_FlagPos(Flag: Byte; ID: Integer = NET_EVERYONE);
@@ -1074,19 +1209,19 @@ begin
   NetOut.Write(gFlags[Flag].Obj.Vel.X);
   NetOut.Write(gFlags[Flag].Obj.Vel.Y);
 
-  g_Net_Host_Send(ID, False, NET_CHAN_IMPORTANT);
+  g_Net_Host_Send(ID, False);
 end;
 
 procedure MH_SEND_GameSettings(ID: Integer = NET_EVERYONE);
 begin
   NetOut.Write(Byte(NET_MSG_GSET));
   NetOut.Write(gGameSettings.GameMode);
-  NetOut.Write(gGameSettings.GoalLimit);
+  NetOut.Write(gGameSettings.ScoreLimit);
   NetOut.Write(gGameSettings.TimeLimit);
   NetOut.Write(gGameSettings.MaxLives);
-  NetOut.Write(gGameSettings.Options);
+  NetOut.Write(LongWord(gGameSettings.Options));
 
-  g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+  g_Net_Host_Send(ID, True);
 end;
 
 // PLAYER (SEND)
@@ -1108,7 +1243,7 @@ begin
   NetOut.Write(P.FColor.B);
   NetOut.Write(P.Team);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT)
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_PlayerPos(Reliable: Boolean; PID: Word; ID: Integer = NET_EVERYONE);
@@ -1153,7 +1288,7 @@ begin
     NetOut.Write(GameAccelY);
   end;
 
-  g_Net_Host_Send(ID, Reliable, NET_CHAN_PLAYERPOS);
+  g_Net_Host_Send(ID, Reliable);
 end;
 
 procedure MH_SEND_PlayerStats(PID: Word; ID: Integer = NET_EVERYONE);
@@ -1188,13 +1323,13 @@ begin
       NetOut.Write(FMaxAmmo[I]);
 
     for I := MR_SUIT to MR_MAX do
-      NetOut.Write(LongWord(FMegaRulez[I]));
+      NetOut.Write(LongWord(FPowerups[I]));
 
-    NetOut.Write(Byte(R_ITEM_BACKPACK in FRulez));
-    NetOut.Write(Byte(R_KEY_RED in FRulez));
-    NetOut.Write(Byte(R_KEY_GREEN in FRulez));
-    NetOut.Write(Byte(R_KEY_BLUE in FRulez));
-    NetOut.Write(Byte(R_BERSERK in FRulez));
+    NetOut.Write(Byte(R_ITEM_BACKPACK in FInventory));
+    NetOut.Write(Byte(R_KEY_RED in FInventory));
+    NetOut.Write(Byte(R_KEY_GREEN in FInventory));
+    NetOut.Write(Byte(R_KEY_BLUE in FInventory));
+    NetOut.Write(Byte(R_BERSERK in FInventory));
 
     NetOut.Write(Frags);
     NetOut.Write(Death);
@@ -1211,7 +1346,7 @@ begin
     NetOut.Write(FSpawnInvul);
   end;
 
-  g_Net_Host_Send(ID, True, NET_CHAN_PLAYER);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_PlayerDamage(PID: Word; Kind: Byte; Attacker, Value: Word; VX, VY: Integer; ID: Integer = NET_EVERYONE);
@@ -1224,7 +1359,7 @@ begin
   NetOut.Write(VX);
   NetOut.Write(VY);
 
-  g_Net_Host_Send(ID, False, NET_CHAN_PLAYER);
+  g_Net_Host_Send(ID, False);
 end;
 
 procedure MH_SEND_PlayerDeath(PID: Word; KillType, DeathType: Byte; Attacker: Word; ID: Integer = NET_EVERYONE);
@@ -1235,7 +1370,7 @@ begin
   NetOut.Write(DeathType);
   NetOut.Write(Attacker);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_PLAYER);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_PlayerFire(PID: Word; Weapon: Byte; X, Y, AX, AY: Integer; ShotID: Integer = -1; ID: Integer = NET_EVERYONE);
@@ -1249,7 +1384,7 @@ begin
   NetOut.Write(AY);
   NetOut.Write(ShotID);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_SHOTS);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_PlayerDelete(PID: Word; ID: Integer = NET_EVERYONE);
@@ -1257,7 +1392,7 @@ begin
   NetOut.Write(Byte(NET_MSG_PLRDEL));
   NetOut.Write(PID);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_PlayerSettings(PID: Word; Mdl: string = ''; ID: Integer = NET_EVERYONE);
@@ -1279,7 +1414,7 @@ begin
   NetOut.Write(Pl.FColor.B);
   NetOut.Write(Pl.Team);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+  g_Net_Host_Send(ID, True);
 end;
 
 // ITEM (SEND)
@@ -1304,7 +1439,7 @@ begin
   NetOut.Write(it.Obj.Vel.X);
   NetOut.Write(it.Obj.Vel.Y);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_ItemDestroy(Quiet: Boolean; IID: Word; ID: Integer = NET_EVERYONE);
@@ -1313,7 +1448,7 @@ begin
   NetOut.Write(IID);
   NetOut.Write(Byte(Quiet));
 
-  g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_ItemPos(IID: Word; ID: Integer = NET_EVERYONE);
@@ -1329,7 +1464,7 @@ begin
   NetOut.Write(it.Obj.Vel.X);
   NetOut.Write(it.Obj.Vel.Y);
 
-  g_Net_Host_Send(ID, False, NET_CHAN_LARGEDATA);
+  g_Net_Host_Send(ID, False);
 end;
 
 // PANEL
@@ -1351,7 +1486,7 @@ begin
     NetOut.Write(AnimLoop);
   end;
 
-  g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_PanelState(PGUID: Integer; ID: Integer = NET_EVERYONE);
@@ -1385,7 +1520,7 @@ begin
   if TP.moveOnce then mpflags := mpflags or 2;
   NetOut.Write(Byte(mpflags));
 
-  g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+  g_Net_Host_Send(ID, True);
 end;
 
 // TRIGGER
@@ -1445,7 +1580,7 @@ begin
     NetOut.Write(Byte(GameDirection));
   end;
 
-  g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_MonsterPos(UID: Word; ID: Integer = NET_EVERYONE);
@@ -1467,7 +1602,7 @@ begin
     NetOut.Write(Byte(GameDirection));
   end;
 
-  g_Net_Host_Send(ID, False, NET_CHAN_MONSTERPOS);
+  g_Net_Host_Send(ID, False);
 end;
 
 procedure MH_SEND_MonsterState(UID: Word; ForcedAnim: Byte = 255; ID: Integer = NET_EVERYONE);
@@ -1494,7 +1629,7 @@ begin
     NetOut.Write(FFireTime);
   end;
 
-  g_Net_Host_Send(ID, True, NET_CHAN_MONSTER);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_MonsterShot(UID: Word; X, Y, VX, VY: Integer; ID: Integer = NET_EVERYONE);
@@ -1506,7 +1641,7 @@ begin
   NetOut.Write(VX);
   NetOut.Write(VY);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_MONSTER);
+  g_Net_Host_Send(ID, True);
 end;
 
 procedure MH_SEND_MonsterDelete(UID: Word; ID: Integer = NET_EVERYONE);
@@ -1519,7 +1654,7 @@ begin
   NetOut.Write(Byte(NET_MSG_MDEL));
   NetOut.Write(UID);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+  g_Net_Host_Send(ID, True);
 end;
 
 // MISC
@@ -1529,7 +1664,7 @@ begin
   NetOut.Write(Byte(NET_MSG_TIME_SYNC));
   NetOut.Write(Time);
 
-  g_Net_Host_Send(ID, False, NET_CHAN_SERVICE);
+  g_Net_Host_Send(ID, False);
 end;
 
 procedure MH_SEND_VoteEvent(EvType: Byte;
@@ -1544,7 +1679,7 @@ begin
   NetOut.Write(StrArg1);
   NetOut.Write(StrArg2);
 
-  g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+  g_Net_Host_Send(ID, True);
 end;
 
 // CLIENT MESSAGES //
@@ -1768,8 +1903,8 @@ procedure MC_RECV_GameStats(var M: TMsg);
 begin
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   begin
-    gTeamStat[TEAM_RED].Goals := M.ReadSmallInt();
-    gTeamStat[TEAM_BLUE].Goals := M.ReadSmallInt();
+    gTeamStat[TEAM_RED].Score := M.ReadSmallInt();
+    gTeamStat[TEAM_BLUE].Score := M.ReadSmallInt();
   end
   else
     if gGameSettings.GameMode = GM_COOP then
@@ -2234,10 +2369,10 @@ end;
 procedure MC_RECV_GameSettings(var M: TMsg);
 begin
   gGameSettings.GameMode := M.ReadByte();
-  gGameSettings.GoalLimit := M.ReadWord();
+  gGameSettings.ScoreLimit := M.ReadWord();
   gGameSettings.TimeLimit := M.ReadWord();
   gGameSettings.MaxLives := M.ReadByte();
-  gGameSettings.Options := M.ReadLongWord();
+  gGameSettings.Options := TGameOptions(M.ReadLongWord());
 end;
 
 // PLAYER
@@ -2264,6 +2399,8 @@ begin
   if (PID <> NetPlrUID1) and (PID <> NetPlrUID2) then
   begin
     if (Pl <> nil) then Exit;
+    if (g_Force_Model_Get() <> 0) then
+      Model := g_Forced_Model_GetName();
     DID := g_Player_Create(Model, Color, T, False);
     with g_Player_Get(DID) do
     begin
@@ -2390,19 +2527,14 @@ begin
       FMaxAmmo[I] := M.ReadWord();
 
     for I := MR_SUIT to MR_MAX do
-      FMegaRulez[I] := M.ReadLongWord();
-
-    FRulez := [];
-    if (M.ReadByte() <> 0) then
-      FRulez := FRulez + [R_ITEM_BACKPACK];
-    if (M.ReadByte() <> 0) then
-      FRulez := FRulez + [R_KEY_RED];
-    if (M.ReadByte() <> 0) then
-      FRulez := FRulez + [R_KEY_GREEN];
-    if (M.ReadByte() <> 0) then
-      FRulez := FRulez + [R_KEY_BLUE];
-    if (M.ReadByte() <> 0) then
-      FRulez := FRulez + [R_BERSERK];
+      FPowerups[I] := M.ReadLongWord();
+
+    FInventory := [];
+    if (M.ReadByte() <> 0) then FInventory += [R_ITEM_BACKPACK];
+    if (M.ReadByte() <> 0) then FInventory += [R_KEY_RED];
+    if (M.ReadByte() <> 0) then FInventory += [R_KEY_GREEN];
+    if (M.ReadByte() <> 0) then FInventory += [R_KEY_BLUE];
+    if (M.ReadByte() <> 0) then FInventory += [R_BERSERK];
 
     Frags := M.ReadLongInt();
     Death := M.ReadLongInt();
@@ -2558,6 +2690,7 @@ procedure MC_RECV_PlayerSettings(var M: TMsg);
 var
   TmpName: string;
   TmpModel: string;
+  CheckModel: string;
   TmpColor: TRGB;
   TmpTeam: Byte;
   Pl: TPlayer;
@@ -2591,6 +2724,8 @@ begin
     Pl.Name := TmpName;
   end;
 
+  if (g_Force_Model_Get() <> 0) then
+    TmpModel := g_Forced_Model_GetName();
   if TmpModel <> Pl.Model.Name then
     Pl.SetModel(TmpModel);
 end;
@@ -3024,6 +3159,7 @@ end;
 // CLIENT SEND
 
 procedure MC_SEND_Info(Password: string);
+var i: Integer;
 begin
   NetOut.Clear();
 
@@ -3036,8 +3172,13 @@ begin
   NetOut.Write(gPlayer1Settings.Color.G);
   NetOut.Write(gPlayer1Settings.Color.B);
   NetOut.Write(gPlayer1Settings.Team);
+  NetOut.Write(gPlayer1Settings.WeaponSwitch);
+  for i := WP_FIRST to WP_LAST + 1 do
+    NetOut.Write(gPlayer1Settings.WeaponPreferences[i]);
+  NetOut.Write(gPlayer1Settings.SwitchToEmpty);
+  NetOut.Write(gPlayer1Settings.SkipIronFist);
 
-  g_Net_Client_Send(True, NET_CHAN_SERVICE);
+  g_Net_Client_Send(True);
 end;
 
 procedure MC_SEND_Chat(Txt: string; Mode: Byte);
@@ -3046,7 +3187,7 @@ begin
   NetOut.Write(Txt);
   NetOut.Write(Mode);
 
-  g_Net_Client_Send(True, NET_CHAN_CHAT);
+  g_Net_Client_Send(True);
 end;
 
 procedure MC_SEND_PlayerPos();
@@ -3160,7 +3301,7 @@ begin
   NetOut.Write(WeaponAct);
   NetOut.Write(WeaponSelect);
   //e_WriteLog(Format('S:ws=%d', [WeaponSelect]), MSG_WARNING);
-  g_Net_Client_Send(True, NET_CHAN_PLAYERPOS);
+  g_Net_Client_Send(True);
 
   //kBytePrev := kByte;
   //kDirPrev := gPlayer1.Direction;
@@ -3171,10 +3312,11 @@ begin
   NetOut.Write(Byte(NET_MSG_VOTE_EVENT));
   NetOut.Write(Byte(Start));
   NetOut.Write(Command);
-  g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
+  g_Net_Client_Send(True);
 end;
 
 procedure MC_SEND_PlayerSettings();
+var i: Integer;
 begin
   NetOut.Write(Byte(NET_MSG_PLRSET));
   NetOut.Write(gPlayer1Settings.Name);
@@ -3183,15 +3325,20 @@ begin
   NetOut.Write(gPlayer1Settings.Color.G);
   NetOut.Write(gPlayer1Settings.Color.B);
   NetOut.Write(gPlayer1Settings.Team);
+  NetOut.Write(gPlayer1Settings.WeaponSwitch);
+  for i := WP_FIRST to WP_LAST + 1 do
+    NetOut.Write(gPlayer1Settings.WeaponPreferences[i]);
+  NetOut.Write(gPlayer1Settings.SwitchToEmpty);
+  NetOut.Write(gPlayer1Settings.SkipIronFist);
 
-  g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
+  g_Net_Client_Send(True);
 end;
 
 procedure MC_SEND_FullStateRequest();
 begin
   NetOut.Write(Byte(NET_MSG_REQFST));
 
-  g_Net_Client_Send(True, NET_CHAN_SERVICE);
+  g_Net_Client_Send(True);
 end;
 
 procedure MC_SEND_CheatRequest(Kind: Byte);
@@ -3199,21 +3346,21 @@ begin
   NetOut.Write(Byte(NET_MSG_CHEAT));
   NetOut.Write(Kind);
 
-  g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
+  g_Net_Client_Send(True);
 end;
 procedure MC_SEND_RCONPassword(Password: string);
 begin
   NetOut.Write(Byte(NET_MSG_RCON_AUTH));
   NetOut.Write(Password);
 
-  g_Net_Client_Send(True, NET_CHAN_SERVICE);
+  g_Net_Client_Send(True);
 end;
 procedure MC_SEND_RCONCommand(Cmd: string);
 begin
   NetOut.Write(Byte(NET_MSG_RCON_CMD));
   NetOut.Write(Cmd);
 
-  g_Net_Client_Send(True, NET_CHAN_SERVICE);
+  g_Net_Client_Send(True);
 end;