Changeset 219 for trunk

Timestamp:

Jun 10, 2018, 12:04:34 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Not possible to continue playing after a game was loaded from file. Wrong assignment of TMap object.

File:

• trunk/UGame.pas (modified) (4 diffs)

trunk/UGame.pas

@@ -1393 +1393 @@
 //  I: Integer;
 begin
+  // Do not assign Game field
   MaxPower := Source.MaxPower;
-  Game := Source.Game;
   Size := Source.Size;
   DefaultCellSize := Source.DefaultCellSize;
@@ -2216 +2216 @@
   TotalCells := Source.TotalCells;
   TotalUnits := Source.TotalUnits;
+  TotalCities := Source.TotalCities;
+  TotalDiscovered := Source.TotalDiscovered;
+  TotalWinObjectiveCells := Source.TotalWinObjectiveCells;
   StartUnits := Source.StartUnits;
   StartCell := Source.StartCell;
@@ -2809 +2812 @@
     else Map := TMap.Create;
   end;
+  Map.Game := Self;
   Map.Assign(OldMap);
   FreeAndNil(OldMap);
@@ -3085 +3089 @@
         Players[I].PlayerMap.CheckVisibility;
       end;
-      Map.ComputePlayerStats;
+      ComputePlayerStats;
       Running := ReadBoolean(RootNode, 'Running', True);
     end;