Changeset 131

Timestamp:

May 1, 2023, 4:54:56 PM (12 months ago)

Author:

chronos

Message:

• Fixed: More game properties correctly saved and loaded.

Location:

trunk

Files:

• UEngine.pas (modified) (18 diffs)
• UItems.pas (modified) (1 diff)

trunk/UEngine.pas

@@ -112 +112 @@
 
   TMetroCarriage = class(TItem)
+    Engine: TEngine;
     Train: TMetroTrain;
     Passengers: TMetroPassengers;
@@ -126 +127 @@
 
   TMetroCarriages = class(TItems<TMetroCarriage>)
+    Engine: TEngine;
+    function CreateItem: TMetroCarriage; override;
     function GetUnused: TMetroCarriage;
     function GetUnusedCount: Integer;
@@ -598 +601 @@
   Node2 := Node.FindNode(DOMString(TMetroPassengers.GetClassSysName));
   if Assigned(Node2) then
-    Passengers.LoadFromXmlNodeRef(Node2, Train.Engine.Passengers);
+    Passengers.LoadFromXmlNodeRef(Node2, Engine.Passengers);
 end;
 
@@ -613 +616 @@
 
 { TMetroCarriages }
+
+function TMetroCarriages.CreateItem: TMetroCarriage;
+begin
+  Result := inherited;
+  Result.Engine := Engine;
+end;
 
 function TMetroCarriages.GetUnused: TMetroCarriage;
@@ -1059 +1068 @@
 var
   Node2: TDOMNode;
+  I: Integer;
 begin
   inherited;
@@ -1076 +1086 @@
   if Assigned(Node2) then
     Carriages.LoadFromXmlNodeRef(Node2, Engine.Carriages);
+  for I := 0 to Carriages.Count - 1 do
+    Carriages[I].Train := Self;
 end;
 
@@ -2460 +2472 @@
     if Save then Action := MenuItemGameSlotSave
       else Action := MenuItemGameSlotLoad;
-    for I := 0 to GameSlotCount - 1 do begin
+    for I := 1 to GameSlotCount do begin
       FileName := GetGameSlotFileName(Integer(I));
       ControlName := SSlot + ' ' + IntToStr(I);
@@ -3389 +3401 @@
   if Assigned(SelectedTrain) then begin
     FocusedTrack := GetTrackOnPos(View.PointDestToSrc(Pos), Intersect);
-    if Assigned(FocusedTrack.Points[0]) then begin
-      TrackPosition.BaseTrackPoint := FocusedTrack.Points[0];
-      TrackPosition.RelPos := Distance(FocusedTrack.Points[0].Position,
-        Intersect);
-      Vector := TrackPosition.GetVector;
-      Angle := Vector.GetAngle;
-
-      if Assigned(LastGrabbedTrain) then begin
-        if TrackPosition.GetTrackPosition >
-          LastGrabbedTrainTrackPosition.GetTrackPosition then
-            GrabbedTrainDirection := 1
-        else
-        if TrackPosition.GetTrackPosition <
-          LastGrabbedTrainTrackPosition.GetTrackPosition then
-          GrabbedTrainDirection := -1;
-      end else GrabbedTrainDirection := 1;
-
-      LastGrabbedTrain := SelectedTrain;
-      LastGrabbedTrainTrackPosition := TrackPosition;
-    end;
-    FocusedTrack.Free;
+    if Assigned(FocusedTrack) then begin
+      if Assigned(FocusedTrack.Points[0]) then begin
+        TrackPosition.BaseTrackPoint := FocusedTrack.Points[0];
+        TrackPosition.RelPos := Distance(FocusedTrack.Points[0].Position,
+          Intersect);
+        Vector := TrackPosition.GetVector;
+        Angle := Vector.GetAngle;
+
+        if Assigned(LastGrabbedTrain) then begin
+          if TrackPosition.GetTrackPosition >
+            LastGrabbedTrainTrackPosition.GetTrackPosition then
+              GrabbedTrainDirection := 1
+          else
+          if TrackPosition.GetTrackPosition <
+            LastGrabbedTrainTrackPosition.GetTrackPosition then
+            GrabbedTrainDirection := -1;
+        end else GrabbedTrainDirection := 1;
+
+        LastGrabbedTrain := SelectedTrain;
+        LastGrabbedTrainTrackPosition := TrackPosition;
+      end;
+      FreeAndNil(FocusedTrack);
+    end;
 
     if GrabbedTrainDirection = -1 then Angle := Angle + Pi;
@@ -3653 +3667 @@
         end;
         FocusedTrack := GetTrackOnPos(View.PointDestToSrc(Position), Intersect);
-        if Assigned(FocusedTrack.Points[0]) then begin
-          SelectedTrain.Line := TMetroLine(FocusedTrack.Points[0].Track.Owner);
-          SelectedTrain.Line.Trains.Add(SelectedTrain);
-          SelectedTrain.TrackPosition.BaseTrackPoint := FocusedTrack.Points[0];
-          SelectedTrain.TrackPosition.RelPos := Distance(FocusedTrack.Points[0].Position,
-            Intersect);
-          SelectedTrain.Direction := GrabbedTrainDirection;
-          SelectedTrain.FindTargetStation;
-          SelectedTrain.LastTrainMoveTime := Time;
+        if Assigned(FocusedTrack) then begin
+          if Assigned(FocusedTrack.Points[0]) then begin
+            SelectedTrain.Line := TMetroLine(FocusedTrack.Points[0].Track.Owner);
+            SelectedTrain.Line.Trains.Add(SelectedTrain);
+            SelectedTrain.TrackPosition.BaseTrackPoint := FocusedTrack.Points[0];
+            SelectedTrain.TrackPosition.RelPos := Distance(FocusedTrack.Points[0].Position,
+              Intersect);
+            SelectedTrain.Direction := GrabbedTrainDirection;
+            SelectedTrain.FindTargetStation;
+            SelectedTrain.LastTrainMoveTime := Time;
+          end;
+          FreeAndNil(FocusedTrack);
         end;
-        FocusedTrack.Free;
 
         LastGrabbedTrain := nil;
@@ -4013 +4029 @@
   NewNode: TDOMNode;
   Node2: TDOMNode;
+  Improvement: TMetroImprovement;
 begin
   Clear;
@@ -4021 +4038 @@
   FLastTime := FTime;
   City := Cities.SearchBySysName(ReadString(Node, 'CityName', ''));
+  AvailableTerminals := ReadInteger(Node, 'AvailableTerminals', AvailableTerminals);
 
   NewNode := Node.FindNode(DOMString(TView.GetClassSysName));
@@ -4037 +4055 @@
   end;
 
+  AvailableImprovements := [];
+  NewNode := Node.FindNode('Improvements');
+  if Assigned(NewNode) then begin
+    Node2 := NewNode.FirstChild;
+    while Assigned(Node2) and (Node2.NodeName = 'Improvement') do begin
+      Improvement := TMetroImprovement(StrToInt(string(Node2.TextContent)));
+      AvailableImprovements := AvailableImprovements + [Improvement];
+      Node2 := Node2.NextSibling;
+    end;
+  end;
+
   NewNode := Node.FindNode(DOMString(TMetroPassengers.GetClassSysName));
   if Assigned(NewNode) then
@@ -4049 +4078 @@
     Lines.LoadFromXmlNode(NewNode);
 
+  NewNode := Node.FindNode(DOMString(TMetroCarriages.GetClassSysName));
+  if Assigned(NewNode) then
+    Carriages.LoadFromXmlNode(NewNode);
+
   NewNode := Node.FindNode(DOMString(TMetroTrains.GetClassSysName));
   if Assigned(NewNode) then
     Trains.LoadFromXmlNode(NewNode);
-
-  NewNode := Node.FindNode(DOMString(TMetroCarriages.GetClassSysName));
-  if Assigned(NewNode) then
-    Carriages.LoadFromXmlNode(NewNode);
 end;
 
@@ -4062 +4091 @@
   I: Integer;
   NewNode: TDOMNode;
+  Improvement: TMetroImprovement;
 begin
   Lines.RebuildItemsId;
   Stations.RebuildItemsId;
   Passengers.RebuildItemsId;
+  Trains.RebuildItemsId;
+  Carriages.RebuildItemsId;
 
   WriteInteger(Node, 'ServedPassengerCount', ServedPassengerCount);
@@ -4072 +4104 @@
   WriteDateTime(Node, 'Time', FTime);
   if Assigned(City) then WriteString(Node, 'CityName', City.SysName);
+  WriteInteger(Node, 'AvailableTerminals', AvailableTerminals);
 
   NewNode := Node.OwnerDocument.CreateElement(DOMString(TView.GetClassSysName));
@@ -4083 +4116 @@
   end;
 
+  NewNode := Node.OwnerDocument.CreateElement('Improvements');
+  Node.AppendChild(NewNode);
+  for Improvement := Low(TMetroImprovement) to High(TMetroImprovement) do begin
+    if Improvement in AvailableImprovements then
+      WriteInteger(NewNode, 'Improvement', Integer(Improvement));
+  end;
+
   NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroPassengers.GetClassSysName));
   Node.AppendChild(NewNode);
@@ -4095 +4135 @@
   Lines.SaveToXmlNode(NewNode);
 
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroCarriages.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Carriages.SaveToXmlNode(NewNode);
+
   NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroTrains.GetClassSysName));
   Node.AppendChild(NewNode);
   Trains.SaveToXmlNode(NewNode);
-
-  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroCarriages.GetClassSysName));
-  Node.AppendChild(NewNode);
-  Carriages.SaveToXmlNode(NewNode);
 end;
 
@@ -4172 +4212 @@
   Trains.Engine := Self;
   Carriages := TMetroCarriages.Create;
+  Carriages.Engine := Self;
   ImageTunnel := TImage.Create;
   ImageLine := TImage.Create;

trunk/UItems.pas

@@ -118 +118 @@
 begin
   Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = DOMString(TItem.GetClassSysName)) do begin
+  while Assigned(Node2) and (Node2.NodeName = DOMString(T.GetClassSysName)) do begin
     RefId := StrToInt(string(Node.TextContent));
     NewItem := Target.FindById(RefId);