Changeset 378 for branches/highdpi/Start.pas

Timestamp:

Apr 24, 2021, 11:41:07 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r377.

File:

• branches/highdpi/Start.pas (modified) (20 diffs)

branches/highdpi/Start.pas

@@ -7 +7 @@
   UDpiControls, GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
-  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap;
+  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap, UBrain;
 
 type
+
+  { TPlayerSlot }
+
   TPlayerSlot = class
     DiffUpBtn: TButtonC;
@@ -54 +57 @@
     AutoEnemyDownBtn: TButtonC;
     ReplayBtn: TButtonB;
+    procedure ListKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure ListKeyPress(Sender: TObject; var Key: char);
     procedure StartBtnClick(Sender: TObject);
     procedure FormPaint(Sender: TObject);
@@ -84 +89 @@
     procedure AutoEnemyDownBtnClick(Sender: TObject);
     procedure ReplayBtnClick(Sender: TObject);
-  public
-    EmptyPicture: TDpiBitmap;
-    procedure UpdateFormerGames;
-    procedure UpdateMaps;
   private
     WorldSize: Integer;
@@ -134 +135 @@
     procedure LoadAiBrainsPictures;
     procedure UpdateInterface;
+    procedure ShowSettings;
+  public
+    EmptyPicture: TDpiBitmap;
+    procedure UpdateFormerGames;
+    procedure UpdateMaps;
   end;
 
@@ -356 +362 @@
   I: Integer;
   S: string;
+  {$IFDEF WINDOWS}
   ResolutionX, ResolutionY, ResolutionBPP, ResolutionFreq: Integer;
+  {$ENDIF}
   ScreenMode: Integer;
 begin
@@ -394 +402 @@
     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
@@ -399 +409 @@
       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');
@@ -407 +421 @@
     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,
@@ -436 +446 @@
     WriteInteger('StartTab', Integer(ShowTab));
     WriteString('LastGame', LastGame);
+    WriteBool('NetworkEnabled', NetworkEnabled);
   finally
     Free;
@@ -492 +503 @@
       (DpiScreen.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;
 
@@ -750 +773 @@
         yMain + 164 { y0Mini-77 } , Phrases.Lookup('STARTCONTROLS', 16));
       if AutoDiff = 1 then
-        FrameImage(Canvas, BrainBeginner.Picture, xDefault, yDefault, 64,
+        FrameImage(Canvas, Brains.GetBeginner.Picture, xDefault, yDefault, 64,
           64, 0, 0, false)
       else
@@ -908 +931 @@
     FormerGames.Delete(I);
     if ListIndex[tbNew] = I then
-      ListIndex[tbNew] := 0
+      ListIndex[tbNew] := 0;
   end;
 end;
@@ -968 +991 @@
 
           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] := BrainBeginner
-                  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;
 
@@ -1027 +1051 @@
       end;
   end;
+end;
+
+procedure TStartDlg.ListKeyPress(Sender: TObject; var Key: char);
+begin
+  if Key = #13 then StartBtnClick(Sender);
+end;
+
+procedure TStartDlg.ListKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+const
+  DelKey = 46;
+begin
+  if Key = DelKey then DeleteBtnClick(Sender)
+    else FormKeyDown(Sender, Key, Shift);
 end;
 
@@ -1162 +1200 @@
   AIBrains: TBrains;
 begin
+  FixedLines := 0;
   PlayerPopupIndex := PlayerIndex;
   EmptyMenu(PopupMenu1.Items);
   if PlayerPopupIndex < 0 then begin // select default AI
-    FixedLines := 0;
+    if NetworkEnabled then begin
+      OfferBrain(BrainNetworkClient, FixedLines);
+      Inc(FixedLines);
+    end;
+
+    MenuItem := TDpiMenuItem.Create(PopupMenu1);
+    MenuItem.Caption := '-';
+    PopupMenu1.Items.Add(MenuItem);
+
+    Inc(FixedLines);
     if Brains.GetKindCount(btAI) >= 2 then begin
       OfferBrain(BrainRandom, FixedLines);
@@ -1177 +1225 @@
     FreeAndNil(AIBrains);
   end else begin
-    FixedLines := 0;
     if PlayerPopupIndex > 0 then begin
       OfferBrain(nil, FixedLines);
@@ -1189 +1236 @@
       end;
     if PlayerPopupIndex > 0 then begin
+      if NetworkEnabled then begin
+        OfferBrain(BrainNetworkServer, FixedLines);
+        Inc(FixedLines);
+      end;
+
       MenuItem := TDpiMenuItem.Create(PopupMenu1);
       MenuItem.Caption := '-';
@@ -1267 +1319 @@
           begin
             PlayersBrain[0] := BrainSuperVirtual;
-            Difficulty[0] := 0
+            Difficulty[0] := 0;
           end;
           if PlayersBrain[0].Kind in [btNoTerm, btSuperVirtual] then
@@ -1424 +1476 @@
     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 +1497 @@
         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