Changeset 99 for trunk/UEngine.pas

Timestamp:

Sep 28, 2022, 4:28:06 PM (20 months ago)

Author:

chronos

Message:

• Fixed: Redrawing scene during paused game.
• Fixed: Disable controls during game over.

File:

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

trunk/UEngine.pas

@@ -187 +187 @@
     function GetTrainOnPos(Pos: TPoint): TMetroTrain;
     function GetCarriageOnPos(Pos: TPoint): TMetroCarriage;
+    procedure DrawFrame(Canvas: TCanvas; Rect: TRect);
     procedure DrawLine(Canvas: TCanvas; Pos: TPoint);
     procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
@@ -329 +330 @@
 resourcestring
   SGameOver = 'Game Over';
-  SGameOverReason = 'Overcrowding at this station has forced you to resign as metro manager.';
+  SGameOverReason = 'Overcrowding at one of your stations has forced you to resign as metro manager.';
   SGameOverStatistic = '%d passengers travelled on your metro over %d days.';
   SDay = 'Day';
@@ -349 +350 @@
   SCzech = 'Czech';
   SEnglish = 'English';
+  SFrench = 'French';
+  SGerman = 'German';
   SBack = 'Back';
   SAutomatic = 'Automatic';
@@ -365 +368 @@
   SNewYork = 'New York';
   STokyo = 'Tokyo';
+  SRome = 'Rome';
 
 { TMetroCarriage }
@@ -1150 +1154 @@
       end;
     end;
+  end;
+end;
+
+procedure TEngine.DrawFrame(Canvas: TCanvas; Rect: TRect);
+begin
+  with Canvas do begin
+    Pen.Color := Self.Colors.Text;
+    Pen.Style := psSolid;
+    Pen.Width := ScaleX(2, 96);
+    Brush.Color := Self.Colors.Background2;
+    Brush.Style := bsSolid;
+    Rectangle(Rect);
+    Pen.Style := psClear;
   end;
 end;
@@ -2110 +2127 @@
 begin
   with Canvas do begin
+    DrawFrame(Canvas, Bounds(CanvasSize.X div 8,  ScaleY(90, 96),
+      Round(CanvasSize.X / 4 * 3), ScaleY(210, 96)));
+
     Canvas.Font.Color := Self.Colors.Text;
-    Brush.Style := bsSolid;
-    Brush.Color := Self.Colors.Background;
+    Brush.Style := bsClear;
+    Pen.Style := psClear;
 
     Y := ScaleY(100, 96);
+
     Font.Size := 40;
     TextOut((CanvasSize.X - TextWidth(SGameOver)) div 2, Y, SGameOver);
@@ -2152 +2173 @@
   Y: Integer;
   X: Integer;
-const
-  ImageZoom = 4;
 begin
   with Canvas do begin
-    Pen.Color := Self.Colors.Text;
-    Pen.Style := psSolid;
-    Pen.Width := ScaleX(2, 96);
-    Brush.Color := Self.Colors.Background2;
-    Brush.Style := bsSolid;
-    Rectangle(Bounds(CanvasSize.X div 4, CanvasSize.Y div 4, CanvasSize.X div 2, CanvasSize.Y div 2));
-    Pen.Style := psClear;
+
+    DrawFrame(Canvas, Bounds(CanvasSize.X div 4, CanvasSize.Y div 4, CanvasSize.X div 2, CanvasSize.Y div 2));
     X := CanvasSize.X div 4 + ScaleX(10, 96);
     Y := CanvasSize.Y div 4 + ScaleX(10, 96);
@@ -2208 +2222 @@
     Center := Point(CanvasSize.X div 2, CanvasSize.Y div 2);
 
-    Pen.Color := Self.Colors.Text;
-    Pen.Style := psSolid;
-    Pen.Width := ScaleX(2, 96);
-    Brush.Color := Self.Colors.Background2;
-    Brush.Style := bsSolid;
-    Rectangle(Bounds(CanvasSize.X div 4, CanvasSize.Y div 4, CanvasSize.X div 2, CanvasSize.Y div 2));
-    Pen.Style := psClear;
+    DrawFrame(Canvas, Bounds(CanvasSize.X div 4, CanvasSize.Y div 4, CanvasSize.X div 2, CanvasSize.Y div 2));
     X := CanvasSize.X div 4 + ScaleX(10, 96);
     Y := CanvasSize.Y div 4 + ScaleX(10, 96);
@@ -2644 +2652 @@
   end;
 
+  if Assigned(SelectedTrain) or Assigned(SelectedCarriage) then Redraw;
+
   LastMousePos := Position;
   if MouseHold then begin
-      FocusedStation := GetStationOnPos(View.PointDestToSrc(Position));
-      Line := nil;
-      if Assigned(TrackStationDown) then begin
-        Line := TMetroLine(TrackStationDown.Track.Owner);
-        Redraw;
-      end;
-      if Assigned(TrackStationUp) then begin
-        Line := TMetroLine(TrackStationUp.Track.Owner);
-        Redraw;
-      end;
-      if Assigned(Line) and not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
-        if Assigned(TrackStationDown) and (TLineStation(TrackStationDown.OwnerPoint).MapStation = FocusedStation) then begin
-          // Disconnect down
-          CurrentTrackPoint := TrackStationDown;
-          TrackStationDown := TrackStationDown.GetDown;
-          Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
-        end else
-        if Assigned(TrackStationUp) and (TLineStation(TrackStationUp.OwnerPoint).MapStation = FocusedStation) then begin
-          // Disconnect up
-          CurrentTrackPoint := TrackStationUp;
-          if Assigned(TrackStationUp) then
-            TrackStationUp := TrackStationUp.GetUp;
-          Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
-        end else
-        if Assigned(Line) and ((not Line.IsCircular) or ((TrackStationDown <> nil) and (TrackStationUp <> nil))) and
-        ((Line.LineStations.SearchMapStation(FocusedStation) = nil) or
-        ((Line.LineStations.Count > 0) and
-        ((Line.LineStations.First.MapStation = FocusedStation) or
-        (Line.LineStations.Last.MapStation = FocusedStation)) and
-        ((TrackStationDown = nil) or (TrackStationUp = nil)) and
-        (not Line.IsCircular))) then begin
-          if Assigned(TrackStationDown) then LineStationDown := TLineStation(TrackStationDown.OwnerPoint)
-            else LineStationDown := nil;
-          if Assigned(TrackStationUp) then LineStationUp := TLineStation(TrackStationUp.OwnerPoint)
-            else LineStationUp := nil;
-          Line.ConnectStation(FocusedStation, LineStationDown, LineStationUp);
-          if Assigned(TrackStationDown) then TrackStationDown := TrackStationDown.GetUp
-            else if Assigned(TrackStationUp) then TrackStationUp := TrackStationUp.GetDown;
-        end;
-      end;
-      LastFocusedStation := FocusedStation;
+    FocusedStation := GetStationOnPos(View.PointDestToSrc(Position));
+    Line := nil;
+    if Assigned(TrackStationDown) then begin
+      Line := TMetroLine(TrackStationDown.Track.Owner);
+      Redraw;
+    end;
+    if Assigned(TrackStationUp) then begin
+      Line := TMetroLine(TrackStationUp.Track.Owner);
+      Redraw;
+    end;
+    if Assigned(Line) and not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
+      if Assigned(TrackStationDown) and (TLineStation(TrackStationDown.OwnerPoint).MapStation = FocusedStation) then begin
+        // Disconnect down
+        CurrentTrackPoint := TrackStationDown;
+        TrackStationDown := TrackStationDown.GetDown;
+        Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
+      end else
+      if Assigned(TrackStationUp) and (TLineStation(TrackStationUp.OwnerPoint).MapStation = FocusedStation) then begin
+        // Disconnect up
+        CurrentTrackPoint := TrackStationUp;
+        if Assigned(TrackStationUp) then
+          TrackStationUp := TrackStationUp.GetUp;
+        Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
+      end else
+      if Assigned(Line) and ((not Line.IsCircular) or ((TrackStationDown <> nil) and (TrackStationUp <> nil))) and
+      ((Line.LineStations.SearchMapStation(FocusedStation) = nil) or
+      ((Line.LineStations.Count > 0) and
+      ((Line.LineStations.First.MapStation = FocusedStation) or
+      (Line.LineStations.Last.MapStation = FocusedStation)) and
+      ((TrackStationDown = nil) or (TrackStationUp = nil)) and
+      (not Line.IsCircular))) then begin
+        if Assigned(TrackStationDown) then LineStationDown := TLineStation(TrackStationDown.OwnerPoint)
+          else LineStationDown := nil;
+        if Assigned(TrackStationUp) then LineStationUp := TLineStation(TrackStationUp.OwnerPoint)
+          else LineStationUp := nil;
+        Line.ConnectStation(FocusedStation, LineStationDown, LineStationUp);
+        if Assigned(TrackStationDown) then TrackStationDown := TrackStationDown.GetUp
+          else if Assigned(TrackStationUp) then TrackStationUp := TrackStationUp.GetDown;
+      end;
+    end;
+    LastFocusedStation := FocusedStation;
   end;
 end;
@@ -2700 +2710 @@
       Menu.MouseUp(Button, Position);
       Redraw;
+    end else
+    if State = gsGameOver then begin
+      ButtonBack.MouseUp(Position);
     end else
     if State = gsNewWeek then begin
@@ -2709 +2722 @@
     end
     else
-    if State = gsRunning then begin
+    if State in [gsRunning, gsPaused] then begin
       ButtonBack.MouseUp(Position);
       ImagePause.MouseUp(Position);
       ImagePlay.MouseUp(Position);
       ImageFastForward.MouseUp(Position);
+      Redraw;
 
       // Place selected train if focused track
@@ -2793 +2807 @@
   NewIndex: Integer;
 begin
-  if (Button = mbLeft) and (State <> gsMenu) then begin
-    MouseHold := True;
-    LastFocusedStation := nil;
-
-    // Train selection
-    SelectedTrain := GetTrainOnPos(View.PointDestToSrc(Position));
-    if Assigned(SelectedTrain) then begin
-      Exit;
-    end;
-
-    // Carriage selection
-    SelectedCarriage := GetCarriageOnPos(View.PointDestToSrc(Position));
-    if Assigned(SelectedCarriage) then begin
-      Exit;
-    end;
-
-    // Select unused train
-    if (Distance(Position, ImageLocomotive.Bounds.CenterPoint) < 30) and
-    (Trains.GetUnusedCount > 0) then begin
-      SelectedTrain := Trains.GetUnused;
-      Exit;
-    end;
-
-    // Select unused carriage
-    if (Distance(Position, ImageCarriage.Bounds.CenterPoint) < 30) and
-    (Carriages.GetUnusedCount > 0) then begin
-      SelectedCarriage := Carriages.GetUnused;
-      Exit;
-    end;
-
-    // New track creation from selected station as start
-    Station := GetStationOnPos(View.PointDestToSrc(Position));
-    if Assigned(Station) then begin
-      if Assigned(SelectedLine) and (SelectedLine.LineStations.Count = 0) then NewLine := SelectedLine
-        else NewLine := GetUnusedLine;
-      if Assigned(NewLine) then begin
-        NewLine.ConnectStation(Station, nil, nil);
-        TrackStationDown := NewLine.Track.Points.Last;
-        TrackStationUp := nil;
-        LastFocusedStation := Station;
-        SelectedLine := NewLine;
+  if (Button = mbLeft) then begin
+    if State in [gsRunning, gsPaused] then begin
+      MouseHold := True;
+      LastFocusedStation := nil;
+      Redraw;
+
+      // Train selection
+      SelectedTrain := GetTrainOnPos(View.PointDestToSrc(Position));
+      if Assigned(SelectedTrain) then begin
         Exit;
       end;
-    end;
-
-    // Line selection
-    Track := GetTrackOnPos(View.PointDestToSrc(Position));
-    if Assigned(Track) and Assigned(Track.Points[0]) and Assigned(Track.Points[1]) then begin
-      SelectedLine := TMetroLine(Track.Points[0].Track.Owner);
-
-      TrackStationDown := Track.Points[0];
-      NewIndex := TrackStationDown.Track.Points.IndexOf(TrackStationDown);
-      while Assigned(TrackStationDown) and (not Assigned(TrackStationDown.OwnerPoint)) do begin
-        NewIndex := NewIndex - 1;
-        if NewIndex >= 0 then TrackStationDown := TrackStationDown.Track.Points[NewIndex]
-          else TrackStationDown := nil;
-      end;
-      TrackStationUp := Track.Points[1];
-      NewIndex := TrackStationUp.Track.Points.IndexOf(TrackStationDown);
-      while Assigned(TrackStationUp) and (not Assigned(TrackStationUp.OwnerPoint)) do begin
-        NewIndex := NewIndex + 1;
-        if NewIndex < TrackStationUp.Track.Points.Count then
-          TrackStationUp := TrackStationUp.Track.Points[NewIndex]
-          else TrackStationUp := nil;
-      end;
-      Track.Free;
-      Exit;
-    end;
-    if Assigned(Track) then Track.Free;
+
+      // Carriage selection
+      SelectedCarriage := GetCarriageOnPos(View.PointDestToSrc(Position));
+      if Assigned(SelectedCarriage) then begin
+        Exit;
+      end;
+
+      // Select unused train
+      if (Distance(Position, ImageLocomotive.Bounds.CenterPoint) < 30) and
+      (Trains.GetUnusedCount > 0) then begin
+        SelectedTrain := Trains.GetUnused;
+        Exit;
+      end;
+
+      // Select unused carriage
+      if (Distance(Position, ImageCarriage.Bounds.CenterPoint) < 30) and
+      (Carriages.GetUnusedCount > 0) then begin
+        SelectedCarriage := Carriages.GetUnused;
+        Exit;
+      end;
+
+      // New track creation from selected station as start
+      Station := GetStationOnPos(View.PointDestToSrc(Position));
+      if Assigned(Station) then begin
+        if Assigned(SelectedLine) and (SelectedLine.LineStations.Count = 0) then NewLine := SelectedLine
+          else NewLine := GetUnusedLine;
+        if Assigned(NewLine) then begin
+          NewLine.ConnectStation(Station, nil, nil);
+          TrackStationDown := NewLine.Track.Points.Last;
+          TrackStationUp := nil;
+          LastFocusedStation := Station;
+          SelectedLine := NewLine;
+          Exit;
+        end;
+      end;
+
+      // Line selection
+      Track := GetTrackOnPos(View.PointDestToSrc(Position));
+      if Assigned(Track) and Assigned(Track.Points[0]) and Assigned(Track.Points[1]) then begin
+        SelectedLine := TMetroLine(Track.Points[0].Track.Owner);
+
+        TrackStationDown := Track.Points[0];
+        NewIndex := TrackStationDown.Track.Points.IndexOf(TrackStationDown);
+        while Assigned(TrackStationDown) and (not Assigned(TrackStationDown.OwnerPoint)) do begin
+          NewIndex := NewIndex - 1;
+          if NewIndex >= 0 then TrackStationDown := TrackStationDown.Track.Points[NewIndex]
+            else TrackStationDown := nil;
+        end;
+        TrackStationUp := Track.Points[1];
+        NewIndex := TrackStationUp.Track.Points.IndexOf(TrackStationDown);
+        while Assigned(TrackStationUp) and (not Assigned(TrackStationUp.OwnerPoint)) do begin
+          NewIndex := NewIndex + 1;
+          if NewIndex < TrackStationUp.Track.Points.Count then
+            TrackStationUp := TrackStationUp.Track.Points[NewIndex]
+            else TrackStationUp := nil;
+        end;
+        Track.Free;
+        Exit;
+      end;
+      if Assigned(Track) then Track.Free;
+    end;
   end;
 end;
@@ -2883 +2900 @@
   end;
   {$IFDEF DEBUG}
-  if Key = KeyF2 then begin
-    if State = gsRunning then begin
+  if State in [gsRunning, gsPaused] then begin
+    if Key = KeyF2 then begin
       State := gsGameOver;
       Redraw;
     end;
-  end else
-  if Key = KeyF3 then begin
-    if State = gsRunning then begin
+    if Key = KeyF3 then begin
       Trains.AddNew;
       Redraw;
     end;
-  end else
-  if Key = KeyF4 then begin
-    if State = gsRunning then begin
+    if Key = KeyF4 then begin
       Carriages.AddNew;
       Redraw;
     end;
-  end else
-  if Key = KeyF5 then begin
-    if State = gsRunning then begin
+    if Key = KeyF5 then begin
       State := gsNewWeek;
       Redraw;
     end;
-  end else
-  if Key = KeyF6 then begin
-    if State = gsRunning then begin
+    if Key = KeyF6 then begin
       Stations.AddNew;
       ResizeView;
@@ -3107 +3116 @@
   begin
     DrawGameOver(Canvas, CanvasSize);
+    DrawGameControls(Canvas, CanvasSize);
   end else
   if State = gsMenu then begin