fix playerstats netmessage; zero gTime before spawning players

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

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 6133b001e2d5fd2df4777195d2bfe433b232db3c..1fd6f7c5a8d3e7a6be8a0dad2ce9ea3980b2b78c 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -491,6 +491,7 @@ begin
   if not C.WaitForFirstSpawn then exit;
   plr := g_Player_Get(C^.Player);
   if not assigned(plr) then exit;
+  g_Net_Slist_ServerPlayerComes();
   e_LogWritefln('*** client #%u (cid #%u) first spawn', [C.ID, C.Player]);
   C.WaitForFirstSpawn := false;
   plr.FNoRespawn := false;
@@ -824,18 +825,14 @@ begin
 end;
 
 procedure MH_SEND_Info(ID: Byte);
-var
-  Map: string;
 begin
-  Map := g_ExtractFileName(gMapInfo.Map);
-
   NetOut.Clear();
 
   NetOut.Write(Byte(NET_MSG_INFO));
   NetOut.Write(ID);
   NetOut.Write(NetClients[ID].Player);
-  NetOut.Write(gGameSettings.WAD);
-  NetOut.Write(Map);
+  NetOut.Write(ExtractFileName(gGameSettings.WAD));
+  NetOut.Write(g_ExtractFileName(gMapInfo.Map));
   NetOut.Write(gWADHash);
   NetOut.Write(gGameSettings.GameMode);
   NetOut.Write(gGameSettings.GoalLimit);
@@ -1181,6 +1178,7 @@ begin
     NetOut.Write(Byte(FJetpack));
     NetOut.Write(FFireTime);
     NetOut.Write(Byte(FFlaming));
+    NetOut.Write(FSpawnInvul);
   end;
 
   g_Net_Host_Send(ID, True, NET_CHAN_PLAYER);
@@ -1800,7 +1798,7 @@ begin
         gGameSettings.GameMode := gSwitchGameMode;
 
         gWADHash := EvHash;
-        if not g_Game_StartMap(EvStr, True) then
+        if not g_Game_StartMap(false{asMegawad}, EvStr, True) then
         begin
           if not isWadPath(EvStr) then
             g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [gGameSettings.WAD + ':\' + EvStr]))
@@ -2356,6 +2354,7 @@ begin
     if (OldFire <= 0) and (FFireTime > 0) then
       g_Sound_PlayExAt('SOUND_IGNITE', Obj.X, Obj.Y);
     Flam := M.ReadByte() <> 0;
+    FSpawnInvul := M.ReadLongInt();
     if OldJet and not FJetpack then
       JetpackOff
     else if not OldJet and FJetpack then