Changeset 107 for trunk

Timestamp:

Oct 4, 2022, 3:53:47 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Initial view resize on new game.
• Fixed: Wrong train drawing position if track points distance close to zero.

Location:

trunk

Files:

• UEngine.pas (modified) (7 diffs)
• UTrack.pas (modified) (1 diff)

trunk/UEngine.pas

@@ -190 +190 @@
     GrabbedTrainDirection: Integer;
     function GetServedDaysCount: Integer;
-    procedure ResizeView;
+    procedure ResizeView(Force: Boolean);
     function GetExistStationShapes: TStationShapeSet;
     function GetStationOnPos(Pos: TPoint): TMapStation;
@@ -325 +325 @@
   MaxPassengersOveloadTime = 2;
   MetroLineThickness = 13;
-  TrackClickDistance = 10;
+  TrackClickDistance = 15;
   EndStationLength = 50;
   ShowDistances = False;
@@ -1034 +1034 @@
 
 // Need to see all stations on screen
-procedure TEngine.ResizeView;
+procedure TEngine.ResizeView(Force: Boolean);
 var
   NewPoint: TPoint;
@@ -1054 +1054 @@
   Intersected := NewView.SourceRect;
   Intersected.Union(View.SourceRect);
-  if Intersected = View.SourceRect then Exit;
+  if not Force and (Intersected = View.SourceRect) then Exit;
 
   View.Assign(NewView);
@@ -2824 +2824 @@
       LastNewStationTime := Time;
       Stations.AddNew;
-      ResizeView;
+      ResizeView(False);
       Redraw;
     end;
@@ -3213 +3213 @@
     if Key = KeyF6 then begin
       Stations.AddNew;
-      ResizeView;
+      ResizeView(False);
       Redraw;
     end else
@@ -3283 +3283 @@
   end;
 
-  ResizeView;
+  ResizeView(True);
 
   SelectedLine := nil;

trunk/UTrack.pas

@@ -130 +130 @@
     UpPoint := BaseTrackPoint.GetNeighUp;
     if Assigned(UpPoint) then begin
+      Result.Direction := SubPoint(UpPoint.Position, Position);
       D := Distance(UpPoint.Position, Position);
       if D > 0 then begin
-        Result.Direction := SubPoint(UpPoint.Position, Position);
         Result.Position := Point(Trunc(Position.X + Result.Direction.X * RelPos / D),
           Trunc(Position.Y + Result.Direction.Y * RelPos / D));
+      end else begin
+        Result.Position := Position;
       end;
     end;