Changeset 134 for trunk/UEngine.pas

Timestamp:

May 2, 2023, 11:48:43 AM (12 months ago)

Author:

chronos

Message:

• Fixed: Translation of week days.
• Fixed: Highest score changed after click at game over screen.

File:

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

trunk/UEngine.pas

@@ -312 +312 @@
     function GetGameSlotFileName(Index: Integer): string;
     procedure AutoSave;
+    procedure CheckScore;
   public
     // Test
@@ -357 +358 @@
     HighestServedPassengerCount: Integer;
     HighestServedDaysCount: Integer;
+    OldHighestServedPassengerCount: Integer;
+    OldHighestServedDaysCount: Integer;
     RegistryContext: TRegistryContext;
     procedure InitMenus;
@@ -2521 +2524 @@
 end;
 
+procedure TEngine.CheckScore;
+begin
+  OldHighestServedDaysCount := HighestServedDaysCount;
+  OldHighestServedPassengerCount := HighestServedPassengerCount;
+
+  if (ServedPassengerCount > HighestServedPassengerCount) then begin
+    HighestServedPassengerCount := ServedPassengerCount;
+    HighestServedDaysCount := ServedDaysCount;
+  end;
+
+  if Assigned(City) then begin
+    if (ServedPassengerCount > City.HighestServedPassengerCount) then begin
+      City.HighestServedPassengerCount := ServedPassengerCount;
+      City.HighestServedDaysCount := ServedDaysCount;
+    end;
+  end;
+end;
+
 function TEngine.DestinationIndexToText(DestinationIndex: TDestinationIndex): string;
 begin
@@ -2870 +2891 @@
 begin
   with Canvas do begin
-    // Calculate new highest score
     Text := '';
-    if (ServedPassengerCount > HighestServedPassengerCount) or
-      (ServedDaysCount > HighestServedDaysCount) then begin
+    if (ServedPassengerCount >= HighestServedPassengerCount) or
+      (ServedDaysCount >= HighestServedDaysCount) then begin
       Text := SNewHighScore + ' ';
     end;
-    Text := Text + Format(SOldHighScore, [HighestServedPassengerCount,
-      HighestServedDaysCount]);
+    Text := Text + Format(SOldHighScore, [OldHighestServedPassengerCount,
+      OldHighestServedDaysCount]);
     Canvas.TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
     Y := Y + Round(TextHeight(Text) * 1.1);
-    if (ServedPassengerCount > HighestServedPassengerCount) then
-      HighestServedPassengerCount := ServedPassengerCount;
-    if (ServedDaysCount > HighestServedDaysCount) then
-      HighestServedDaysCount := ServedDaysCount;
-
-    if Assigned(City) then begin
-      if (ServedPassengerCount > City.HighestServedPassengerCount) then
-        City.HighestServedPassengerCount := ServedPassengerCount;
-      if (ServedDaysCount > City.HighestServedDaysCount) then
-        City.HighestServedDaysCount := ServedDaysCount;
-    end;
   end;
 end;
@@ -3558 +3567 @@
       if OverloadDuration >= MaxPassengersOveloadTime then begin
         State := gsGameOver;
+        CheckScore;
         Redraw;
       end;
@@ -3564 +3574 @@
     if Assigned(City) and (ServedPassengerCount >= City.PassengersCountToUnlock) then begin
       State := gsSuccess;
+      CheckScore;
       Redraw;
     end;
@@ -3860 +3871 @@
   KeyF7 = 118;
   KeyF8 = 119;
+  KeyF9 = 120;
 {$ENDIF}
   KeyT = 84;
@@ -3898 +3910 @@
     if Key = KeyF2 then begin
       State := gsGameOver;
+      CheckScore;
       Redraw;
     end;
@@ -3919 +3932 @@
     if Key = KeyF7 then begin
       State := gsSuccess;
+      CheckScore;
       Redraw;
     end else
     if Key = KeyF8 then begin
       Inc(AvailableTerminals);
+      Redraw;
+    end else
+    if Key = KeyF9 then begin
+      Inc(ServedPassengerCount, 100);
       Redraw;
     end;
@@ -4059 +4077 @@
   LastNewPassengerTime := ReadDateTime(Node, 'LastNewPassengerTime', LastNewPassengerTime);
   LastNewStationTime := ReadDateTime(Node, 'LastNewStationTime', LastNewStationTime);
+  TerminalCountVisible := ReadBoolean(Node, 'TerminalCountVisible', TerminalCountVisible);
+  CarriageCountVisible := ReadBoolean(Node, 'CarriageCountVisible', CarriageCountVisible);
 
   NewNode := Node.FindNode(DOMString(TView.GetClassSysName));
@@ -4132 +4152 @@
   WriteDateTime(Node, 'LastNewPassengerTime', LastNewPassengerTime);
   WriteDateTime(Node, 'LastNewStationTime', LastNewStationTime);
+  WriteBoolean(Node, 'TerminalCountVisible', TerminalCountVisible);
+  WriteBoolean(Node, 'CarriageCountVisible', CarriageCountVisible);
 
   NewNode := Node.OwnerDocument.CreateElement(DOMString(TView.GetClassSysName));