Changeset 16 for trunk

Timestamp:

Mar 27, 2015, 10:26:05 PM (9 years ago)

Author:

chronos

Message:

• Added: Space bar key have a pause function now to stop train movement and time flow.

Location:

trunk

Files:

• UEngine.pas (modified) (13 diffs)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (2 diffs)

trunk/UEngine.pas

@@ -144 +144 @@
     LastNewWeekTime: TDateTime;
     LastNewShapeTime: TDateTime;
+    LastTickTime: TDateTime;
     ImagePassenger: TImage;
     ImageLocomotive: TImage;
+    FTime: TDateTime;
     function GetExistStationShapes: TStationShapeSet;
     function GetStationOnPos(Pos: TPoint): TMetroStation;
@@ -157 +159 @@
     procedure ComputeShapeDistanceStation(Station: TMetroStation;
       UpdatedShape: TStationShape; Distance: Integer);
-    function GetTime: TDateTime;
     procedure TrainMovement;
   public
@@ -171 +172 @@
     ServedPassengerCount: Integer;
     State: TGameState;
-    StartTime: TDateTime;
     procedure Tick;
     procedure MouseMove(Position: TPoint);
@@ -180 +180 @@
     destructor Destroy; override;
     procedure Paint(Canvas: TCanvas);
-    property Time: TDateTime read GetTime;
+    property Time: TDateTime read FTime;
   end;
 
@@ -199 +199 @@
   MaxWaitingPassengers = 10;
   MetroLineThickness = 13;
+  TrackClickDistance = 20;
 
 implementation
@@ -604 +605 @@
   T: Integer;
   D: Integer;
+  MinD: Integer;
 const
   Distance = 30;
@@ -609 +611 @@
   Result := nil;
   I := 0;
+  MinD := High(Integer);
   while (I < Lines.Count) do
   with TMetroLine(Lines[I]) do begin
     for T := 1 to TrackPoints.Count - 1 do begin
       D := PointToLineDistance(Pos, TTrackPoint(TrackPoints[T - 1]).Point, TTrackPoint(TrackPoints[T]).Point);
-      if D < Distance then begin
+      if (D < MinD) and (D < TrackClickDistance) then begin
+        MinD := D;
         Result := TMetroLine(Lines[I]);
-        Break;
       end;
     end;
-    if Assigned(Result) then Break;
     Inc(I);
   end;
@@ -789 +791 @@
 end;
 
-function TEngine.GetTime: TDateTime;
-begin
-  Result := (Now - StartTime) / OneSecond * (60 * OneMinute);
-end;
-
 procedure TEngine.TrainMovement;
 var
@@ -976 +973 @@
 begin
   if State = gsRunning then begin
+    FTime := FTime + (Now - LastTickTime) / OneSecond * (60 * OneMinute);
 
   // Add new trains
@@ -1021 +1019 @@
 
   end;
+  LastTickTime := Now;
 end;
 
@@ -1105 +1104 @@
 procedure TEngine.Reset;
 var
-  NewLine: TMetroLine;
   NewTrain: TMetroTrain;
   I: Integer;
   NewStation: TMetroStation;
+  InitialStationCount: Integer;
 begin
   Passengers.Clear;
@@ -1118 +1117 @@
 
   // Start with 3 stations with each different shape
-  NewStation := Stations.AddNew;
-  NewStation.Shape := ssSquare;
-  NewStation := Stations.AddNew;
-  NewStation.Shape := ssCircle;
-  NewStation := Stations.AddNew;
-  NewStation.Shape := ssTriangle;
+  InitialStationCount := 30;
+  for I := 0 to InitialStationCount - 1 do begin
+    NewStation := Stations.AddNew;
+    if I = 0 then NewStation.Shape := ssSquare
+    else if I = 1 then NewStation.Shape := ssCircle
+    else if I = 2 then NewStation.Shape := ssTriangle;
+  end;
 
   for I := 0 to 2 do begin
-    NewLine := Lines.AddNew;
+    Lines.AddNew;
     NewTrain := TMetroTrain.Create;
     Trains.Add(NewTrain);
@@ -1136 +1136 @@
   LastNewWeekTime := Now;
   LastNewShapeTime := Now;
+  LastTickTime := Now;
+  FTime := 0;
   State := gsRunning;
-  StartTime := Now;
 end;
 

trunk/UFormMain.lfm

@@ -9 +9 @@
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnKeyPress = FormKeyPress
   OnShow = FormShow
   LCLVersion = '1.5'

trunk/UFormMain.pas

@@ -18 +18 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormKeyPress(Sender: TObject; var Key: char);
     procedure FormShow(Sender: TObject);
     procedure PaintBox1Click(Sender: TObject);
@@ -52 +53 @@
 begin
   Engine.Free;
+end;
+
+procedure TFormMain.FormKeyPress(Sender: TObject; var Key: char);
+begin
+  if (Key = #32) then begin
+    if Engine.State = gsRunning then Engine.State := gsPaused
+    else if Engine.State = gsPaused then Engine.State := gsRunning;
+  end;
 end;