Changeset 367 for trunk/GameServer.pas

Timestamp:

Apr 14, 2021, 9:12:03 AM (4 years ago)

Author:

chronos

Message:

• Modified: Enable in development network game only if NetworkEnabled registry value is activated.

File:

• trunk/GameServer.pas (modified) (8 diffs)

trunk/GameServer.pas

@@ -64 +64 @@
   BrainNetworkClient: TBrain;
   BrainNetworkServer: TBrain;
+
+  NetworkEnabled: Boolean;
 
 procedure Init(NotifyFunction: TNotifyFunction);
@@ -157 +159 @@
 end;
 
+procedure CallAllPlayers(Command: Integer; var Data);
+var
+  I: Integer;
+begin
+  for I := 0 to nPl - 1 do
+    if Assigned(bix[I]) then
+      CallPlayer(Command, I, Data);
+end;
+
 procedure CallClient(bix, Command: integer; var Data);
 begin
@@ -208 +219 @@
   BrainSuperVirtual.Initialized := False;
   BrainSuperVirtual.Kind := btSuperVirtual;
-  BrainNetworkClient := Brains.AddNew;
-  BrainNetworkClient.FileName := ':NetworkClient';
-  BrainNetworkClient.Flags := fMultiple;
-  BrainNetworkClient.Initialized := False;
-  BrainNetworkClient.ServerVersion := Version;
-  BrainNetworkClient.Kind := btNetworkClient;
+  if NetworkEnabled then begin
+    BrainNetworkClient := Brains.AddNew;
+    BrainNetworkClient.FileName := ':NetworkClient';
+    BrainNetworkClient.Flags := fMultiple;
+    BrainNetworkClient.Initialized := False;
+    BrainNetworkClient.ServerVersion := Version;
+    BrainNetworkClient.Kind := btNetworkClient;
+  end;
   BrainTerm := Brains.AddNew;
   BrainTerm.FileName := ':StdIntf';
@@ -225 +238 @@
   BrainRandom.Initialized := False;
   BrainRandom.Kind := btRandom;
-  BrainNetworkServer := Brains.AddNew;
-  BrainNetworkServer.FileName := ':NetworkServer';
-  BrainNetworkServer.Flags := fMultiple;
-  BrainNetworkServer.Initialized := False;
-  BrainNetworkServer.ServerVersion := Version;
-  BrainNetworkServer.Kind := btNetworkServer;
+  if NetworkEnabled then begin
+    BrainNetworkServer := Brains.AddNew;
+    BrainNetworkServer.FileName := ':NetworkServer';
+    BrainNetworkServer.Flags := fMultiple;
+    BrainNetworkServer.Initialized := False;
+    BrainNetworkServer.ServerVersion := Version;
+    BrainNetworkServer.Kind := btNetworkServer;
+  end;
 
   if FindFirst(GetAiDir + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
@@ -1330 +1345 @@
     begin
       CL.State := FormerCLState;
-      Break
-    end
+      Break;
+    end;
   end;
 {$IFOPT O-}InvalidTreatyMap := 0; {$ENDIF}
@@ -1339 +1354 @@
   Newlx, Newly, NewLandMass, NewMaxTurn: integer);
 var
-  p: integer;
+  I: Integer;
 begin
   Notify(ntStartDone);
@@ -1364 +1379 @@
   StartGame;
   NoLogChanges;
-  for p := 0 to nPl - 1 do
-    if Assigned(bix[p]) then
-      CallPlayer(cGetReady, p, nil^);
+  CallAllPlayers(cGetReady, nil^);
   LogChanges;
   CL.Put(sTurn, 0, 0, nil);
@@ -1374 +1387 @@
   nLogOpened := -1;
   LastEndClientCommand := -1;
-  bix[0].Client(cShowGame, 0, nil^);
+  CallPlayer(cShowGame, 0, nil^);
+  for I := 0 to nPl - 1 do
+    if Assigned(bix[I]) and (bix[I].Kind = btNetworkServer) then
+      CallPlayer(cShowGame, I, nil^);
   Notify(ntBackOff);
   Inform(pTurn);