Changeset 78 for trunk

Timestamp:

Jun 2, 2021, 6:27:13 PM (3 years ago)

Author:

chronos

Message:

• Added: Snap package definition file.
• Added: Detect language files in different system location.
• Added: Two screenshots.
• Fixed: Missing parallel track line ending shift.
• Modified: Various small typos.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• Images/Screenshots (added)
• Images/Screenshots/Game.png (added)
• Images/Screenshots/Main screen.png (added)
• Install/snap (added)
• Install/snap/local (added)
• Install/snap/local/BigMetro.desktop (added)
• Install/snap/local/build.sh (added)
• Install/snap/snapcraft.yaml (added)
• UEngine.pas (modified) (7 diffs)

trunk/Forms/UFormMain.pas

@@ -67 +67 @@
 
 procedure TFormMain.FormCreate(Sender: TObject);
-begin
+const
+  LinuxLanguagesDir = '/usr/share/BigMetro/languages';
+begin
+  {$IFDEF Linux}
+  // If installed in Linux system then use installation directory for po files
+  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
+    Translator1.POFilesFolder := LinuxLanguagesDir;
+  {$ENDIF}
+
   Engine := TEngine.Create;
   LoadConfig;

trunk/UEngine.pas

@@ -1257 +1257 @@
     if ComparePoint(P2, Position) and not ComparePoint(P1, Position) then begin
       Angle := ArcTan2(P1.Y - Position.Y, P1.X - Position.X);
-    end else Angle := 0;// else raise Exception.Create('TrackLink angle rrror');
+    end else Angle := 0;// else raise Exception.Create('TrackLink angle error');
 
     GroupItem := TPAngleGroup.SearchAngle(Angle);
@@ -1265 +1265 @@
       TPAngleGroup.Add(GroupItem);
     end;
-    GroupItem.TrackLinks.Add(TrackLinks[I])
+    GroupItem.TrackLinks.Add(TrackLinks[I]);
   end;
 
@@ -1278 +1278 @@
         NewShift.X := Trunc(MetroLineThickness * Cos(HAngle) * (J - (TrackLinks.Count - 1) / 2));
         NewShift.Y := Trunc(MetroLineThickness * Sin(HAngle) * (J - (TrackLinks.Count - 1) / 2));
-        //NewShift.X := TrackLinks.Count;
         Shift := NewShift;
       end;
@@ -1900 +1899 @@
   for MetroLine in Lines do
   with MetroLine do begin
+    // Update start
     if Track.Points.Count > 1 then begin
       Track.Points[0].Position := Track.Points[0].PositionDesigned +
         Track.Points[0].LinkUp.Shift;
     end;
+
     for I := 1 to Track.Points.Count - 1 do
     with Track.Points[I] do
@@ -1933 +1934 @@
 //      end;
     end;
+
+    // Update ending
+    if Track.Points.Count > 1 then begin
+      Track.Points[Track.Points.Count - 1].Position := Track.Points[Track.Points.Count - 1].PositionDesigned -
+        Track.Points[Track.Points.Count - 1].LinkDown.Shift;
+    end;
   end;
 
   // Remove all temporal links
   for MetroLine in Lines do
-  with MetroLine do
+  with MetroLine do begin
     for J := 0 to Track.Points.Count - 1 do
     if Assigned(Track.Points[J].LinkUp) then begin
@@ -1944 +1951 @@
       Track.Points[J + 1].LinkDown := nil;
     end;
+  end;
 end;
 
@@ -2726 +2734 @@
   TrackStationUp := nil;
   SelectedTrain := nil;
+  Redraw;
 end;