Changeset 86 for trunk/Game.pas

Timestamp:

Jun 7, 2024, 12:47:11 PM (3 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Used TFormEx for all forms for code simplification.
• Fixed: Fullscreen mode switching error.

File:

• trunk/Game.pas (moved) (moved from trunk/UGame.pas ) (7 diffs)

trunk/Game.pas

@@ -1 @@
-unit UGame;
-
-{$mode delphi}{$H+}
+unit Game;
 
 interface
 
 uses
-  Classes, SysUtils, Dialogs, fgl, Graphics, Types, Forms, Math, DateUtils,
+  Classes, SysUtils, Dialogs, Generics.Collections, Graphics, Types, Forms, Math, DateUtils,
   Controls, RegistryEx;
 
@@ -26 +24 @@
   end;
 
-  TTiles = class(TFPGObjectList<TTile>)
+  TTiles = class(TObjectList<TTile>)
   end;
 
@@ -50 +48 @@
   { THistoryMoves }
 
-  THistoryMoves = class(TFPGObjectList<THistoryMove>)
+  THistoryMoves = class(TObjectList<THistoryMove>)
     procedure SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
     procedure LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
@@ -166 +164 @@
   end;
 
-  TGames = class(TFPGObjectList<TGame>)
+  TGames = class(TObjectList<TGame>)
   end;
 
@@ -196 +194 @@
 
 uses
-  UCore, MetaCanvas;
+  Core, MetaCanvas;
 
 procedure Translate;
@@ -627 +625 @@
   TopBarHeight := ScaleY(24, 96);
   MetaCanvas.Brush.Style := bsSolid;
-  MetaCanvas.Brush.Color := Core.ThemeManager1.Theme.ColorControl;
+  MetaCanvas.Brush.Color := Core.Core.ThemeManager1.Theme.ColorControl;
   MetaCanvas.FillRect(0, 0, MetaCanvas.Width, MetaCanvas.Height);
 
   ValueStr := SScore + ': ' + IntToStr(Score);
   MetaCanvas.Brush.Style := bsClear;
-  MetaCanvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
+  MetaCanvas.Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
   MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);
   MetaCanvas.TextOut(ScaleY(16, 96), (TopBarHeight - MetaCanvas.TextHeight(ValueStr)) div 2, ValueStr);
 
   ValueStr := STopScore + ': ' + IntToStr(TopScore);
-  MetaCanvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
+  MetaCanvas.Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
   MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);
   MetaCanvas.TextOut(ScaleY(136, 96), (TopBarHeight - MetaCanvas.TextHeight(ValueStr)) div 2, ValueStr);
@@ -1232 +1230 @@
 function TGame.GetTileColor(Value: Integer): TColor;
 begin
-  if Core.ThemeManager1.Theme.Name = 'Dark' then begin
+  if Core.Core.ThemeManager1.Theme.Name = 'Dark' then begin
     case Value of
       0: Result := $222629;