system: remove sys_GetTicks

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

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 3701038e76d8f3063378d92364612cdbab798973..8fa73f6720e4d9cc084621e929dcac0668868f28 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -284,8 +284,8 @@ function IsValidFilePath(const S: String): Boolean;
 implementation
 
 uses
 implementation
 
 uses

-  Math, ENet, e_input, e_graphics, e_log,
-  g_textures, g_gfx, g_sound, g_console, g_basic, g_options, g_main,
+  Math, ENet, e_input, e_log, g_base, g_basic,
+  g_textures, g_gfx, g_sound, g_console, g_options,

   g_game, g_player, g_map, g_panel, g_items, g_weapons, g_phys, g_gui,
   g_language, g_monsters, g_netmaster, utils, wadreader, MAPDEF;
 
   g_game, g_player, g_map, g_panel, g_items, g_weapons, g_phys, g_gui,
   g_language, g_monsters, g_netmaster, utils, wadreader, MAPDEF;
 


@@ -341,7 +341,7 @@ procedure MH_MalformedPacket(C: pTNetClient);
 begin
   g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
     _lc[I_NET_DISC_PROTOCOL]);
 begin
   g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
     _lc[I_NET_DISC_PROTOCOL]);

-  enet_peer_disconnect(C^.Peer, NET_DISC_PROTOCOL);
+  g_Net_Host_Kick(C^.ID, NET_DISC_PROTOCOL);

 end;
 
 procedure MH_RECV_Chat(C: pTNetClient; var M: TMsg);
 end;
 
 procedure MH_RECV_Chat(C: pTNetClient; var M: TMsg);


@@ -380,6 +380,10 @@ procedure MH_RECV_Info(C: pTNetClient; var M: TMsg);
 var
   Ver, PName, Model, Pw: string;
   R, G, B, T: Byte;
 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;
   PID: Word;
   Color: TRGB;
   I: Integer;


@@ -395,6 +399,11 @@ begin
     G := M.ReadByte();
     B := M.ReadByte();
     T := 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;
   except
     Err := True;
   end;


@@ -405,7 +414,7 @@ begin
   begin
     g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
       _lc[I_NET_DISC_VERSION]);
   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;
 
     Exit;
   end;
 


@@ -415,13 +424,13 @@ begin
     begin
       g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
         _lc[I_NET_DISC_BAN]);
     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]);
     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;
     end;
     Exit;
   end;


@@ -431,7 +440,7 @@ begin
     begin
       g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
         _lc[I_NET_DISC_PASSWORD]);
     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;
 
       Exit;
     end;
 


@@ -450,6 +459,12 @@ begin
   with g_Player_Get(PID) do
   begin
     Name := PName;
   with g_Player_Get(PID) do
   begin
     Name := PName;

+    WeapSwitchMode := WeapSwitch;
+    SetWeaponPrefs(TmpPrefArray);
+    SwitchToEmpty := SwitchEmpty;
+    SkipFist := SkipF;
+    if (g_Force_Model_Get() <> 0) then
+      SetModel(g_Forced_Model_GetName());

     Reset(True);
   end;
 
     Reset(True);
   end;
 


@@ -542,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]);
 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)
   if gGameOn then
   begin
     MH_SEND_Everything((C^.State = NET_STATE_AUTH), C^.ID)


@@ -700,6 +723,11 @@ var
   TmpModel: string;
   TmpColor: TRGB;
   TmpTeam: Byte;
   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;
   Err: Boolean;
 begin
   Pl: TPlayer;
   Err: Boolean;
 begin


@@ -711,6 +739,11 @@ begin
     TmpColor.G := M.ReadByte();
     TmpColor.B := M.ReadByte();
     TmpTeam := 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;
   except
     Err := True;
   end;


@@ -731,9 +764,21 @@ begin
     Pl.Name := TmpName;
   end;
 
     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 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.SkipFist) then
+    Pl.SkipFist := TmpSkipF;
+

   MH_SEND_PlayerSettings(Pl.UID, TmpModel);
 end;
 
   MH_SEND_PlayerSettings(Pl.UID, TmpModel);
 end;
 


@@ -861,11 +906,14 @@ procedure MH_SEND_Everything(CreatePlayers: Boolean {= False}; ID: Integer {= NE
 var
   I: Integer;
 begin
 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
 
   if gPlayers <> nil then
   begin


@@ -938,7 +986,7 @@ begin
   NetOut.Write(g_ExtractFileName(gMapInfo.Map));
   NetOut.Write(gWADHash);
   NetOut.Write(gGameSettings.GameMode);
   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(gGameSettings.TimeLimit);
   NetOut.Write(gGameSettings.MaxLives);
   NetOut.Write(gGameSettings.Options);


@@ -1092,8 +1140,8 @@ begin
   NetOut.Write(Byte(NET_MSG_SCORE));
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   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
   end
   else
     if gGameSettings.GameMode = GM_COOP then


@@ -1168,7 +1216,7 @@ procedure MH_SEND_GameSettings(ID: Integer = NET_EVERYONE);
 begin
   NetOut.Write(Byte(NET_MSG_GSET));
   NetOut.Write(gGameSettings.GameMode);
 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(gGameSettings.TimeLimit);
   NetOut.Write(gGameSettings.MaxLives);
   NetOut.Write(gGameSettings.Options);


@@ -1855,8 +1903,8 @@ procedure MC_RECV_GameStats(var M: TMsg);
 begin
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   begin
 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
   end
   else
     if gGameSettings.GameMode = GM_COOP then


@@ -2321,7 +2369,7 @@ end;
 procedure MC_RECV_GameSettings(var M: TMsg);
 begin
   gGameSettings.GameMode := M.ReadByte();
 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.TimeLimit := M.ReadWord();
   gGameSettings.MaxLives := M.ReadByte();
   gGameSettings.Options := M.ReadLongWord();


@@ -2351,6 +2399,8 @@ begin
   if (PID <> NetPlrUID1) and (PID <> NetPlrUID2) then
   begin
     if (Pl <> nil) then Exit;
   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
     DID := g_Player_Create(Model, Color, T, False);
     with g_Player_Get(DID) do
     begin


@@ -2447,7 +2497,6 @@ var
   PID: Word;
   Pl: TPlayer;
   I, OldFire: Integer;
   PID: Word;
   Pl: TPlayer;
   I, OldFire: Integer;

-  checkWeapon: Boolean;

   OldJet, Flam: Boolean;
   NewTeam: Byte;
 begin
   OldJet, Flam: Boolean;
   NewTeam: Byte;
 begin


@@ -2469,19 +2518,8 @@ begin
     NewTeam := M.ReadByte();
 
     for I := WP_FIRST to WP_LAST do
     NewTeam := M.ReadByte();
 
     for I := WP_FIRST to WP_LAST do

-    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;
+      FWeapon[I] := (M.ReadByte() <> 0);
+

     for I := A_BULLETS to A_HIGH do
       FAmmo[I] := M.ReadWord();
 
     for I := A_BULLETS to A_HIGH do
       FAmmo[I] := M.ReadWord();
 


@@ -2657,6 +2695,7 @@ procedure MC_RECV_PlayerSettings(var M: TMsg);
 var
   TmpName: string;
   TmpModel: string;
 var
   TmpName: string;
   TmpModel: string;

+  CheckModel: string;

   TmpColor: TRGB;
   TmpTeam: Byte;
   Pl: TPlayer;
   TmpColor: TRGB;
   TmpTeam: Byte;
   Pl: TPlayer;


@@ -2690,6 +2729,8 @@ begin
     Pl.Name := TmpName;
   end;
 
     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;
   if TmpModel <> Pl.Model.Name then
     Pl.SetModel(TmpModel);
 end;


@@ -3123,6 +3164,7 @@ end;
 // CLIENT SEND
 
 procedure MC_SEND_Info(Password: string);
 // CLIENT SEND
 
 procedure MC_SEND_Info(Password: string);

+var i: Integer;

 begin
   NetOut.Clear();
 
 begin
   NetOut.Clear();
 


@@ -3135,6 +3177,11 @@ begin
   NetOut.Write(gPlayer1Settings.Color.G);
   NetOut.Write(gPlayer1Settings.Color.B);
   NetOut.Write(gPlayer1Settings.Team);
   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.SkipFist);

 
   g_Net_Client_Send(True, NET_CHAN_SERVICE);
 end;
 
   g_Net_Client_Send(True, NET_CHAN_SERVICE);
 end;


@@ -3274,6 +3321,7 @@ begin
 end;
 
 procedure MC_SEND_PlayerSettings();
 end;
 
 procedure MC_SEND_PlayerSettings();

+var i: Integer;

 begin
   NetOut.Write(Byte(NET_MSG_PLRSET));
   NetOut.Write(gPlayer1Settings.Name);
 begin
   NetOut.Write(Byte(NET_MSG_PLRSET));
   NetOut.Write(gPlayer1Settings.Name);


@@ -3282,6 +3330,11 @@ begin
   NetOut.Write(gPlayer1Settings.Color.G);
   NetOut.Write(gPlayer1Settings.Color.B);
   NetOut.Write(gPlayer1Settings.Team);
   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.SkipFist);

 
   g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
 end;
 
   g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
 end;