Changeset 84 for trunk

Timestamp:

Dec 31, 2021, 9:48:23 AM (3 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• Languages/BigMetro.cs.po (modified) (1 diff)
• Languages/BigMetro.po (modified) (1 diff)
• UEngine.pas (modified) (15 diffs)

trunk/Languages/BigMetro.cs.po

@@ -49 +49 @@
 msgstr "Nové vysoké skóre!"
 
+#: uengine.snooldstationtoconnectnew
+msgid "No old line station to connect new station"
+msgstr ""
+
 #: uengine.soldhighscore
 msgid "Old high score was %d passengers in %d days."
 msgstr "Dřívější vysoké skóre bylo %d cestujících v %d dnech."
+
+#: uengine.sstationnotdefined
+msgid "Station have to be defined"
+msgstr ""
+
+#: uengine.sstationwithoutmapstation
+msgid "Station have to have MapStation"
+msgstr ""
+
+#: uengine.strackpointnotfound
+msgid "Track point %d not found"
+msgstr ""
 
 #: uengine.szerozoomnotalowed

trunk/Languages/BigMetro.po

@@ -39 +39 @@
 msgstr ""
 
+#: uengine.snooldstationtoconnectnew
+msgid "No old line station to connect new station"
+msgstr ""
+
 #: uengine.soldhighscore
 msgid "Old high score was %d passengers in %d days."
+msgstr ""
+
+#: uengine.sstationnotdefined
+msgid "Station have to be defined"
+msgstr ""
+
+#: uengine.sstationwithoutmapstation
+msgid "Station have to have MapStation"
+msgstr ""
+
+#: uengine.strackpointnotfound
+msgid "Track point %d not found"
 msgstr ""
 

trunk/UEngine.pas

@@ -188 +188 @@
   end;
 
+  TMetroTrain = class;
+
+  TMetroCarriage = class
+    Train: TMetroTrain;
+  end;
+
+  TMetroCarriages = class(TFPGObjectList<TMetroCarriage>)
+  end;
+
   { TMetroTrain }
 
@@ -204 +213 @@
     InStation: Boolean;
     TargetStation: TLineStation;
+    Carriages: TMetroCarriages;
     function GetTargetStationDistance: Integer;
     function GetPosition: TPoint;
@@ -421 +431 @@
 
 uses
-  UGeometric, UFormMain, ULanguages, UPixelPointer;
+  UGeometric, UFormMain, ULanguages;
 
 resourcestring
@@ -433 +443 @@
   SNewHighScore = 'New high score!';
   SOldHighScore = 'Old high score was %d passengers in %d days.';
+  STrackPointNotFound = 'Track point %d not found';
+  SStationNotDefined = 'Station have to be defined';
+  SNoOldStationToConnectNew = 'No old line station to connect new station';
+  SStationWithoutMapStation = 'Station have to have MapStation';
 
 { TTrackLinks }
@@ -475 +489 @@
 destructor TTrack.Destroy;
 begin
-  Points.Free;
-  Links.Free;
+  FreeAndNil(Points);
+  FreeAndNil(Links);
   inherited;
 end;
@@ -490 +504 @@
 destructor TTrackLink.Destroy;
 begin
-  Points.Free;
+  FreeAndNil(Points);
   inherited;
 end;
@@ -512 +526 @@
 destructor TMap.Destroy;
 begin
-  Rivers.Free;
+  FreeAndNil(Rivers);
   inherited;
 end;
@@ -618 +632 @@
 destructor TTrackPointsAngle.Destroy;
 begin
-  TrackLinks.Free;
+  FreeAndNil(TrackLinks);
   inherited;
 end;
@@ -744 +758 @@
 destructor TTrackPoint.Destroy;
 begin
-  NeighLinks.Free;
-  NeighPoints.Free;
+  FreeAndNil(NeighLinks);
+  FreeAndNil(NeighPoints);
   inherited;
 end;
@@ -917 +931 @@
 begin
   if not Assigned(Station) then
-    raise Exception.Create('Station have to be defined');
+    raise Exception.Create(SStationNotDefined);
   if not Assigned(LineStationDown) and not Assigned(LineStationUp) and (LineStations.Count > 0) then
-    raise Exception.Create('No old line station to connect new station');
+    raise Exception.Create(SNoOldStationToConnectNew);
   NewLineStation := TLineStation.Create;
   NewLineStation.Line := Self;
@@ -1061 +1075 @@
   Index2 := Points.IndexOf(TP2);
   if (Index1 = -1) then
-    raise Exception.Create('TrackPoint1 not found');
+    raise Exception.Create(Format(STrackPointNotFound, [1]));
   if (Index2 = -1) then
-    raise Exception.Create('TrackPoint2 not found');
+    raise Exception.Create(Format(STrackPointNotFound, [2]));
   if Index1 > Index2 then begin
     Temp := Index1;
@@ -1095 +1109 @@
 destructor TMetroLine.Destroy;
 begin
-  Trains.Free;
-  LineStations.Free;
-  Track.Free;
+  FreeAndNil(Trains);
+  FreeAndNil(LineStations);
+  FreeAndNil(Track);
   inherited;
 end;
@@ -1184 +1198 @@
   Passengers := TMetroPassengers.Create;
   Passengers.FreeObjects := False;
+  Carriages := TMetroCarriages.Create;
   Direction := 1;
   Line := nil;
@@ -1190 +1205 @@
 destructor TMetroTrain.Destroy;
 begin
-  Passengers.Free;
+  FreeAndNil(Passengers);
+  FreeAndNil(Carriages);
   inherited;
 end;
@@ -1791 +1807 @@
           // Load new passengers
           if Assigned(CurrentStation) and not Assigned(CurrentStation.MapStation) then
-            raise Exception.Create('Station have to have MapStation');
+            raise Exception.Create(SStationWithoutMapStation);
           if Assigned(CurrentStation)  then
           for P := CurrentStation.MapStation.Passengers.Count - 1 downto 0 do begin