Changeset 94 for trunk/UEngine.pas

Timestamp:

Sep 27, 2022, 12:04:27 AM (20 months ago)

Author:

chronos

Message:

• Fixed: Night and day state in clock.
• Fixed: Translation of short days of weeks names.

File:

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

trunk/UEngine.pas

@@ -187 +187 @@
     procedure DrawTrains(Canvas: TCanvas);
     procedure DrawGameOver(Canvas: TCanvas; CanvasSize: TPoint);
+    procedure DrawNewTrain(Canvas: TCanvas; CanvasSize: TPoint);
     procedure DrawStationPassengerOverload(Canvas: TCanvas);
     procedure DrawLines(Canvas: TCanvas);
@@ -1834 +1835 @@
   ClockSize = 20;
 begin
+  if (Time / OneHour > 6) and (Time / OneHour < 18) then begin
+    Canvas.Brush.Style := bsSolid;
+    Canvas.Brush.Color := Colors.Background;
+  end else begin
+    Canvas.Brush.Style := bsSolid;
+    Canvas.Brush.Color := Colors.Text;
+  end;
   Canvas.Pen.Style := psSolid;
   Canvas.Pen.Color := Colors.Text;
@@ -1840 +1848 @@
   Angle := Time / (12 * OneHour) * 2 * Pi - Pi / 2;
   Canvas.EllipseC(ClockCenter.X, ClockCenter.Y, ClockSize, ClockSize);
+  Canvas.Brush.Style := bsClear;
+
+  if (Time / OneHour > 6) and (Time / OneHour < 18) then begin
+    Canvas.Pen.Color := Colors.Text;
+  end else begin
+    Canvas.Pen.Color := Colors.Background;
+  end;
   Canvas.Line(ClockCenter, Point(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
     ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8)));
   for I := 0 to 12 do begin
     Angle := I / 12 * 2 * Pi;
-    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
-      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8),
+    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.7),
+      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.7),
       ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.9),
       ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.9));
   end;
-  Y := ClockCenter.Y + ScaleY(5, 96);
-
+  Y := ClockCenter.Y;
+
+  Canvas.Pen.Color := Colors.Text;
   Canvas.Font.Color := Colors.Text;
   Text := FormatDateTime('ddd', Time + 2);
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 10,
+  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - ScaleX(10, 96),
     Y - Canvas.TextHeight(Text) div 2, Text);
-  Y := Y + Canvas.TextHeight(Text)  + ScaleY(5, 96);
+  Y := Y + Canvas.TextHeight(Text) + ScaleY(5, 96);
 
   Text := SDay + ' ' + IntToStr(Trunc(Time));
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 10,
+  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - ScaleX(10, 96),
     Y - Canvas.TextHeight(Text) div 2, Text);
-  Y := Y + Canvas.TextHeight(Text)  + ScaleY(5, 96);
+  Y := Y + Canvas.TextHeight(Text) + ScaleY(5, 96);
 
   ImagePause.Canvas := Canvas;
-  ImagePause.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96), Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImagePause.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96), Y,
+    ScaleX(20, 96), ScaleY(20, 96));
   ImagePause.Paint;
   Y := Y + ImagePause.Bounds.Height + ScaleY(5, 96);
 
   ImagePlay.Canvas := Canvas;
-  ImagePlay.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImagePlay.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y,
+    ScaleX(20, 96), ScaleY(20, 96));
   ImagePlay.Paint;
   Y := Y + ImagePlay.Bounds.Height + ScaleY(5, 96);
 
   ImageFastForward.Canvas := Canvas;
-  ImageFastForward.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImageFastForward.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y,
+    ScaleX(20, 96), ScaleY(20, 96));
   ImageFastForward.Paint;
   Y := Y + ImageFastForward.Bounds.Height + ScaleY(5, 96);
@@ -1989 +2008 @@
       HighestServedDaysCount := ServedDaysCount;
   end;
+end;
+
+procedure TEngine.DrawNewTrain(Canvas: TCanvas; CanvasSize: TPoint);
+begin
+
 end;