Changeset 118 for trunk/UEngine.pas

Timestamp:

Oct 23, 2022, 10:55:55 PM (19 months ago)

Author:

chronos

Message:

• Added: UCore main data module.
• Added: Test cases support for better future testing.

File:

• trunk/UEngine.pas (modified) (9 diffs)

trunk/UEngine.pas

@@ -9 +9 @@
   Classes, SysUtils, Graphics, Controls, ExtCtrls, Math, DateUtils, Types,
   URegistry, UMetaCanvas, Generics.Collections, Generics.Defaults, UMenu,
-  UControls, UMetroPassenger, UColors, UView, URiver, UTrack, UCity, UGeometric;
+  UControls, UMetroPassenger, UColors, UView, URiver, UTrack, UCity, UGeometric,
+  UPersistentForm, UTranslator;
 
 type
@@ -164 +165 @@
     FOnDarkModeChange: TNotifyEvent;
     FState: TGameState;
+    FTranslator: TTranslator;
     LastMousePos: TPoint;
     LastFocusedStation: TMapStation;
@@ -246 +248 @@
     procedure EvaluateImprovement(Improvement: TMetroImprovement);
   public
+    // Test
+    function GetSelectedOrUnusedMetroLine: TMetroLine;
+  public
     AvailableTerminals: Integer;
     Week: Integer;
@@ -304 +309 @@
     procedure Paint(Canvas: TCanvas; CanvasSize: TPoint);
     property Time: TDateTime read FTime;
-    property DarkMode: Boolean read FDarkMode write SetDarkMode;
     property State: TGameState read FState write SetState;
     property ServedDaysCount: Integer read GetServedDaysCount;
+  published
+    property DarkMode: Boolean read FDarkMode write SetDarkMode;
+    property Translator: TTranslator read FTranslator write FTranslator;
     property OnDarkModeChange: TNotifyEvent read FOnDarkModeChange
       write FOnDarkModeChange;
@@ -1711 +1718 @@
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
-      FormMain.Translator1.LanguageListToStrings(States);
-      Index := States.IndexOfObject(FormMain.Translator1.Language);
+      if Assigned(Translator) then begin
+        Translator.LanguageListToStrings(States);
+        Index := States.IndexOfObject(Translator.Language);
+      end;
       if Index = -1 then Index := 0;
     end;
@@ -1859 +1868 @@
 begin
   NewLanguage := TLanguage(TMenuItemComboBox(Sender).States.Objects[TMenuItemComboBox(Sender).Index]);
-  if FormMain.Translator1.Language <> NewLanguage then begin
-    FormMain.Translator1.Language := NewLanguage;
-    FormMain.Translator1.Translate;
+  if Assigned(Translator) and (Translator.Language <> NewLanguage) then begin
+    Translator.Language := NewLanguage;
+    Translator.Translate;
     InitMenus;
 
@@ -1874 +1883 @@
 begin
   FormMain.FullScreen := TMenuItemCheckBox(Sender).Checked;
-  FormMain.PersistentForm1.SetFullScreen(FormMain.FullScreen);
+  with TPersistentForm.Create(nil) do
+  try
+    SetFullScreen(FormMain.FullScreen);
+  finally
+    Free;
+  end;
 end;
 
@@ -1963 +1977 @@
     miTerminal: Inc(AvailableTerminals);
   end;
+end;
+
+function TEngine.GetSelectedOrUnusedMetroLine: TMetroLine;
+begin
+  if Assigned(SelectedLine) and (SelectedLine.LineStations.Count = 0) then
+    Result := SelectedLine
+    else Result := GetUnusedLine;
 end;
 
@@ -3114 +3135 @@
       Station := GetStationOnPos(View.PointDestToSrc(Position));
       if Assigned(Station) then begin
-        if Assigned(SelectedLine) and (SelectedLine.LineStations.Count = 0) then NewLine := SelectedLine
-          else NewLine := GetUnusedLine;
+        NewLine := GetSelectedOrUnusedMetroLine;
         if Assigned(NewLine) then begin
           NewLine.ConnectStation(Station, nil, nil);