Changeset 367 for trunk

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Direct.pas (modified) (1 diff)
• GameServer.pas (modified) (8 diffs)
• Network/UNetworkServer.pas (modified) (1 diff)
• Protocol.pas (modified) (1 diff)
• Start.pas (modified) (8 diffs)

trunk/Direct.pas

@@ -186 +186 @@
   BrainTerm.Client := LocalPlayer.Client;
   BrainTerm.Name := Phrases.Lookup('HUMAN');
-  BrainNetworkServer.Client := UNetworkServer.Client;
-  BrainNetworkServer.Name := Phrases.Lookup('NETWORK_SERVER');
-  BrainNetworkClient.Client := UNetworkClient.Client;
-  BrainNetworkClient.Name := Phrases.Lookup('NETWORK_CLIENT');
+  if NetworkEnabled then begin
+    BrainNetworkServer.Client := UNetworkServer.Client;
+    BrainNetworkServer.Name := Phrases.Lookup('NETWORK_SERVER');
+    BrainNetworkClient.Client := UNetworkClient.Client;
+    BrainNetworkClient.Name := Phrases.Lookup('NETWORK_CLIENT');
+  end;
   BrainRandom.Name := Phrases.Lookup('RANDOMAI');
   Canvas.Font.Assign(UniFont[ftNormal]);

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);

trunk/Network/UNetworkServer.pas

@@ -237 +237 @@
   InitModuleData: TInitModuleData;
 begin
-  NewConnection := TNetworkServerConnection.Create;;
+  NewConnection := TNetworkServerConnection.Create;
   NewConnection.Socket := AStream;
   NewConnection.NetworkServer := Self;

trunk/Protocol.pas

@@ -1995 +1995 @@
     cmShowCancelTreatyByAlliance: Result := SizeOf(Integer);
     cmShowEndContact: Result := 0;
+    cmShowGame: Result := 0;
     //sIntCancelTreaty: Result := SizeOf(Integer);
     else begin

trunk/Start.pas

@@ -360 +360 @@
   I: Integer;
   S: string;
+  {$IFDEF WINDOWS}
   ResolutionX, ResolutionY, ResolutionBPP, ResolutionFreq: Integer;
+  {$ENDIF}
   ScreenMode: Integer;
 begin
@@ -398 +400 @@
     if ValueExists('LastGame') then LastGame := Reg.ReadString('LastGame')
        else LastGame := '';
+    if ValueExists('NetworkEnabled') then NetworkEnabled := Reg.ReadBool('NetworkEnabled')
+       else NetworkEnabled := False;
 
     if ValueExists('ScreenMode') then
@@ -403 +407 @@
       else ScreenMode := 1;
     FullScreen := ScreenMode > 0;
+    if ValueExists('MultiControl') then
+      MultiControl := ReadInteger('MultiControl')
+      else MultiControl := 0;
+    {$IFDEF WINDOWS}
     if ValueExists('ResolutionX') then
       ResolutionX := ReadInteger('ResolutionX');
@@ -411 +419 @@
     if ValueExists('ResolutionFreq') then
       ResolutionFreq := ReadInteger('ResolutionFreq');
-    if ValueExists('MultiControl') then
-      MultiControl := ReadInteger('MultiControl')
-      else MultiControl := 0;
-    {$IFDEF WINDOWS}
     if ScreenMode = 2 then
       ChangeResolution(ResolutionX, ResolutionY, ResolutionBPP,
@@ -440 +444 @@
     WriteInteger('StartTab', Integer(ShowTab));
     WriteString('LastGame', LastGame);
+    WriteBool('NetworkEnabled', NetworkEnabled);
   finally
     Free;
@@ -924 +929 @@
     FormerGames.Delete(I);
     if ListIndex[tbNew] = I then
-      ListIndex[tbNew] := 0
+      ListIndex[tbNew] := 0;
   end;
 end;
@@ -1183 +1188 @@
   EmptyMenu(PopupMenu1.Items);
   if PlayerPopupIndex < 0 then begin // select default AI
-    OfferBrain(BrainNetworkClient, FixedLines);
-    Inc(FixedLines);
+    if NetworkEnabled then begin
+      OfferBrain(BrainNetworkClient, FixedLines);
+      Inc(FixedLines);
+    end;
 
     MenuItem := TMenuItem.Create(PopupMenu1);
@@ -1213 +1220 @@
       end;
     if PlayerPopupIndex > 0 then begin
-      OfferBrain(BrainNetworkServer, FixedLines);
-      Inc(FixedLines);
+      if NetworkEnabled then begin
+        OfferBrain(BrainNetworkServer, FixedLines);
+        Inc(FixedLines);
+      end;
 
       MenuItem := TMenuItem.Create(PopupMenu1);