Changeset 364 for trunk/Start.pas

Timestamp:

Apr 12, 2021, 11:55:20 PM (4 years ago)

Author:

chronos

Message:

• Added: Partial network game play implementation.
• Modified: Code cleanup.

File:

• trunk/Start.pas (modified) (11 diffs)

trunk/Start.pas

@@ -10 +10 @@
 
 type
+
+  { TPlayerSlot }
+
   TPlayerSlot = class
     DiffUpBtn: TButtonC;
@@ -84 +87 @@
     procedure AutoEnemyDownBtnClick(Sender: TObject);
     procedure ReplayBtnClick(Sender: TObject);
-  public
-    EmptyPicture: TBitmap;
-    procedure UpdateFormerGames;
-    procedure UpdateMaps;
   private
     WorldSize: Integer;
@@ -134 +133 @@
     procedure LoadAiBrainsPictures;
     procedure UpdateInterface;
+    procedure ShowSettings;
+  public
+    EmptyPicture: TBitmap;
+    procedure UpdateFormerGames;
+    procedure UpdateMaps;
   end;
 
@@ -492 +496 @@
       (Screen.Height - Height) div 2, Width, Height)
   end;
+end;
+
+procedure TStartDlg.ShowSettings;
+begin
+  SettingsDlg := TSettingsDlg.Create(nil);
+  if SettingsDlg.ShowModal = mrOk then begin
+    LoadAssets;
+    Invalidate;
+    UpdateInterface;
+    Background.UpdateInterface;
+  end;
+  FreeAndNil(SettingsDlg);
 end;
 
@@ -968 +984 @@
 
           OpenKey(AppRegistryKey, True);
-          if AutoDiff > 0 then
-          begin
-            WriteString('DefaultAI', BrainDefault.FileName);
-            SlotAvailable := 0; // PlayerSlot will be invalid hereafter
-            PlayersBrain[0] := BrainTerm;
-            Difficulty[0] := PlayerAutoDiff[AutoDiff];
-            for I := 1 to nPl - 1 do
-              if (Page = pgStartRandom) and (I <= AutoEnemies) or
-                (Page = pgStartMap) and (I < nMapStartPositions) then begin
-                if AutoDiff = 1 then PlayersBrain[I] := Brains.GetBeginner
-                  else PlayersBrain[I] := BrainDefault;
-                Difficulty[I] := EnemyAutoDiff[AutoDiff];
-              end  else PlayersBrain[I] := nil;
-          end else begin
-            for I := 6 to 8 do
-              if (PlayersBrain[0].Kind <> btNoTerm) and (MultiControl and (1 shl I) <> 0)
-              then begin
-                PlayersBrain[I + 3] := PlayersBrain[I];
-                Difficulty[I + 3] := Difficulty[I];
-                PlayersBrain[I + 6] := PlayersBrain[I];
-                Difficulty[I + 6] := Difficulty[I];
-              end else begin
-                PlayersBrain[I + 3] := nil;
-                PlayersBrain[I + 6] := nil;
-              end;
+          if BrainDefault.Kind <> btNetworkClient then begin
+            if AutoDiff > 0 then begin
+              WriteString('DefaultAI', BrainDefault.FileName);
+              SlotAvailable := 0; // PlayerSlot will be invalid hereafter
+              PlayersBrain[0] := BrainTerm;
+              Difficulty[0] := PlayerAutoDiff[AutoDiff];
+              for I := 1 to nPl - 1 do
+                if (Page = pgStartRandom) and (I <= AutoEnemies) or
+                  (Page = pgStartMap) and (I < nMapStartPositions) then begin
+                  if AutoDiff = 1 then PlayersBrain[I] := Brains.GetBeginner
+                    else PlayersBrain[I] := BrainDefault;
+                  Difficulty[I] := EnemyAutoDiff[AutoDiff];
+                end else PlayersBrain[I] := nil;
+            end else begin
+              for I := 6 to 8 do
+                if (PlayersBrain[0].Kind <> btNoTerm) and (MultiControl and (1 shl I) <> 0)
+                then begin
+                  PlayersBrain[I + 3] := PlayersBrain[I];
+                  Difficulty[I + 3] := Difficulty[I];
+                  PlayersBrain[I + 6] := PlayersBrain[I];
+                  Difficulty[I + 6] := Difficulty[I];
+                end else begin
+                  PlayersBrain[I + 3] := nil;
+                  PlayersBrain[I + 6] := nil;
+                end;
+            end;
           end;
 
@@ -1162 +1179 @@
   AIBrains: TBrains;
 begin
+  FixedLines := 0;
   PlayerPopupIndex := PlayerIndex;
   EmptyMenu(PopupMenu1.Items);
   if PlayerPopupIndex < 0 then begin // select default AI
-    FixedLines := 0;
+    OfferBrain(BrainNetworkClient, FixedLines);
+    Inc(FixedLines);
+
+    MenuItem := TMenuItem.Create(PopupMenu1);
+    MenuItem.Caption := '-';
+    PopupMenu1.Items.Add(MenuItem);
+
+    Inc(FixedLines);
     if Brains.GetKindCount(btAI) >= 2 then begin
       OfferBrain(BrainRandom, FixedLines);
@@ -1177 +1202 @@
     FreeAndNil(AIBrains);
   end else begin
-    FixedLines := 0;
     if PlayerPopupIndex > 0 then begin
       OfferBrain(nil, FixedLines);
@@ -1189 +1213 @@
       end;
     if PlayerPopupIndex > 0 then begin
+      OfferBrain(BrainNetworkServer, FixedLines);
+      Inc(FixedLines);
+
       MenuItem := TMenuItem.Create(PopupMenu1);
       MenuItem.Caption := '-';
@@ -1267 +1294 @@
           begin
             PlayersBrain[0] := BrainSuperVirtual;
-            Difficulty[0] := 0
+            Difficulty[0] := 0;
           end;
           if PlayersBrain[0].Kind in [btNoTerm, btSuperVirtual] then
@@ -1424 +1451 @@
     ChangeTab(TStartTab((x - TabOffset) div TabSize));
   end
-  else if Page = pgMain then
-  begin
+  else if Page = pgMain then begin
     case SelectedAction of
-      maConfig:
-        begin
-          SettingsDlg := TSettingsDlg.Create(nil);
-          if SettingsDlg.ShowModal = mrOk then begin
-            LoadAssets;
-            Invalidate;
-            UpdateInterface;
-            Background.UpdateInterface;
-          end;
-          FreeAndNil(SettingsDlg);
-        end;
-      maManual:
-        DirectHelp(cStartHelp);
-      maCredits:
-        DirectHelp(cStartCredits);
-      maAIDev:
-        OpenDocument(HomeDir + AITemplateFileName);
-      maWeb:
-        OpenURL(CevoHomepage);
+      maConfig: ShowSettings;
+      maManual: DirectHelp(cStartHelp);
+      maCredits: DirectHelp(cStartCredits);
+      maAIDev: OpenDocument(HomeDir + AITemplateFileName);
+      maWeb: OpenURL(CevoHomepage);
     end;
   end
@@ -1460 +1472 @@
         else
           PopupMenu1.Popup(left + xBrain[I] + 4, top + yBrain[I] + 4);
-      end
+      end;
   end
   else if (AutoDiff > 1) and ((Page = pgStartRandom) or (Page = pgStartMap)) and