Changeset 89

Timestamp:

Sep 22, 2022, 9:37:46 PM (2 years ago)

Author:

chronos

Message:

• Modified: Move TMetroPassenger unit into separate unit.

Location:

trunk

Files:

• BigMetro.lpi (modified) (2 diffs)
• BigMetro.lpr (modified) (1 diff)
• UEngine.pas (modified) (8 diffs)
• UMetroPassenger.pas (added)

trunk/BigMetro.lpi

@@ -89 +89 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="7">
+    <Units Count="8">
       <Unit0>
         <Filename Value="BigMetro.lpr"/>
@@ -124 +124 @@
         <IsPartOfProject Value="True"/>
       </Unit6>
+      <Unit7>
+        <Filename Value="UMetroPassenger.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit7>
     </Units>
   </ProjectOptions>

trunk/BigMetro.lpr

@@ -8 +8 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, SysUtils, UFormMain, UFormImages, Common, UMenu, UControls;
+  Forms, SysUtils, UFormMain, UFormImages, Common, UMenu, UControls, 
+UMetroPassenger;
 
 {$R *.res}

trunk/UEngine.pas

@@ -8 +8 @@
   {$IFDEF DARWIN}MacOSAll, CocoaAll, CocoaUtils,{$ENDIF}
   Classes, SysUtils, Graphics, Controls, ExtCtrls, Math, DateUtils,
-  UMetaCanvas, Generics.Collections, Generics.Defaults, UMenu, UControls;
+  UMetaCanvas, Generics.Collections, Generics.Defaults, UMenu, UControls,
+  UMetroPassenger;
 
 type
-  TStationShape = (ssCircle, ssSquare, ssTriangle, ssStar, ssPlus, ssPentagon,
-    ssDiamond, ssQuarterCircle, ssHexagon, ssCross, ssHalfCircle, ssHeptagon);
   TStationShapeSet = set of TStationShape;
   TEngine = class;
-  TMetroPassengers = class;
   TMetroLines = class;
   TMetroLine = class;
@@ -228 +226 @@
     function GetUnusedCount: Integer;
     function AddNew: TMetroTrain;
-  end;
-
-  TMetroPassenger = class
-    Engine: TEngine;
-    Shape: TStationShape;
-    Station: TMapStation;
-    Train: TMetroTrain;
-  end;
-
-  { TMetroPassengers }
-
-  TMetroPassengers = class(TObjectList<TMetroPassenger>)
-    Engine: TEngine;
-    function AddNew: TMetroPassenger;
   end;
 
@@ -775 +759 @@
 end;
 
-{ TMetroPassengers }
-
-function TMetroPassengers.AddNew: TMetroPassenger;
-begin
-  Result := TMetroPassenger.Create;
-  Result.Engine := Engine;
-  Result.Shape := TStationShape(Random(Integer(Engine.ShapeCount)));
-  Add(Result);
-end;
-
 { TMetroTrains }
 
@@ -1756 +1730 @@
   // Move trains
   for I := 0 to Trains.Count - 1 do
-  with Trains[I] do begin
+  with TMetroTrain(Trains[I]) do begin
     if not Assigned(TargetStation) and Assigned(BaseTrackPoint) then begin
       if (Direction <> 1) and (Direction <> -1) then Direction := 1
@@ -1814 +1788 @@
               Passengers.Delete(P);
               CurrentStation.MapStation.Passengers.Add(Passenger);
-              Passenger.Station := CurrentStation.MapStation;
             end;
           end;
@@ -1826 +1799 @@
               Passenger := CurrentStation.MapStation.Passengers[P];
               if CurrentStation.MapStation.IsBestStationForShape(Passenger.Shape,
-            TargetStation, CurrentStation) then begin
-                Passenger.Station := nil;
+              TargetStation, CurrentStation) then begin
                 CurrentStation.MapStation.Passengers.Delete(P);
                 Passengers.Add(Passenger);
-                Passenger.Train := Trains[I];
               end;
             end else Break; // No more space
@@ -2585 +2556 @@
     if Random < NewPassengerProbability then begin
       Passenger := Self.Passengers.AddNew;
-      Passenger.Station := MapStation;
+      Passenger.Shape := TStationShape(Random(Integer(ShapeCount)));
       Passengers.Add(Passenger);
 
       // Passenger is not allowed to have same shape
-      while (Passenger.Shape = Passenger.Station.Shape) or
+      while (Passenger.Shape = Shape) or
       not (Passenger.Shape in GetExistStationShapes) do
         Passenger.Shape := TStationShape((Integer(Passenger.Shape) + 1) mod Integer(ShapeCount));
@@ -2937 +2908 @@
   Lines.Engine := Self;
   Passengers := TMetroPassengers.Create;
-  Passengers.Engine := Self;
   Map := TMap.Create;
   View := TView.Create;