Changeset 108 for trunk

Timestamp:

Oct 4, 2022, 4:31:22 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Exception in calculating grabbed train direction.

File:

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

trunk/UEngine.pas

@@ -187 +187 @@
     CarriageCountVisible: Boolean;
     TerminalCountVisible: Boolean;
-    GrabbedTrainLastTrackPosition: TTrackPosition;
+    LastGrabbedTrainTrackPosition: TTrackPosition;
     GrabbedTrainDirection: Integer;
+    LastGrabbedTrain: TMetroTrain;
     function GetServedDaysCount: Integer;
     procedure ResizeView(Force: Boolean);
@@ -2742 +2743 @@
       Angle := Vector.GetAngle;
 
-      if TrackPosition.GetTrackPosition >
-        GrabbedTrainLastTrackPosition.GetTrackPosition then
-          GrabbedTrainDirection := 1
-      else
-      if TrackPosition.GetTrackPosition <
-        GrabbedTrainLastTrackPosition.GetTrackPosition then
-        GrabbedTrainDirection := -1;
-
-      GrabbedTrainLastTrackPosition := TrackPosition;
+      if Assigned(LastGrabbedTrain) then begin
+        if TrackPosition.GetTrackPosition >
+          LastGrabbedTrainTrackPosition.GetTrackPosition then
+            GrabbedTrainDirection := 1
+        else
+        if TrackPosition.GetTrackPosition <
+          LastGrabbedTrainTrackPosition.GetTrackPosition then
+          GrabbedTrainDirection := -1;
+      end else GrabbedTrainDirection := 1;
+
+      LastGrabbedTrain := SelectedTrain;
+      LastGrabbedTrainTrackPosition := TrackPosition;
     end;
     FocusedTrack.Free;
@@ -3003 +3007 @@
         end;
         FocusedTrack.Free;
+
+        LastGrabbedTrain := nil;
       end;