From: fgsfds <pvt.fgsfds@gmail.com>
Date: Sun, 1 Mar 2020 19:33:18 +0000 (+0300)
Subject: fix (?) survival spectator; add space after comma in masterlist
X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=4e51e140c0b57225fddec5c839cecf3f3cdec9cc

fix (?) survival spectator; add space after comma in masterlist
---

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 6226f00..b658c37 100644
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -147,7 +147,7 @@ var
   NetPongSock:   ENetSocket = ENET_SOCKET_NULL;
 
   NetUseMaster: Boolean = True;
-  NetMasterList: string = 'mpms.doom2d.org:25665,deadsoftware.ru:25665';
+  NetMasterList: string = 'mpms.doom2d.org:25665, deadsoftware.ru:25665';
 
   NetClientIP:   string = '127.0.0.1';
   NetClientPort: Word   = 25666;
diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index c2e379b..57e5136 100644
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -2344,12 +2344,12 @@ begin
     FSpectator := M.ReadByte() <> 0;
     if FSpectator then
     begin
-      if Pl = gPlayer1 then
+      if PID = NetPlrUID1 then
       begin
         gSpectLatchPID1 := UID;
         gPlayer1 := nil;
       end;
-      if Pl = gPlayer2 then
+      if PID = NetPlrUID2 then
       begin
         gSpectLatchPID2 := UID;
         gPlayer2 := nil;
diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 091935c..3f53262 100644
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -271,7 +271,7 @@ begin
   gsPlayers := 1;
 
   (* section MasterServer *)
-  NetMasterList := 'mpms.doom2d.org:25665,deadsoftware.ru:25665';
+  NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665';
   g_Net_Slist_Set(NetMasterList);
 
   (* section Server *)