Changeset 401 for tags/1.4.0/Game.pas

Timestamp:

Jan 6, 2025, 11:12:12 AM (3 days ago)

Author:

chronos

Message:

Merged revision(s) 396-400 from trunk:

• Fixed: Charts form chart was not drawn on the initial show.
• Fixed: Run Randomize only once at startup.
• Fixed: Store current state of RandSeed to game save.
• Fixed: Load/store RandSeed as its Cardinal type instead of Integer.
• Modified: Maximum number of player set to 12.
• Fixed: Standard yellow color is too bright and not readable with white text. Used darker yellow instead.
• Fixed: Integrity checks for id references loaded from game file.
• Fixed: Wrong players and units id recalculation during game save causing bad references.
• Modified: Set new created players as computer.
• Fixed: Scale charts line width.
• Fixed: Item form made bigger to avoid showing scrollbars.
• Fixed: Item form string control made shorter.

Location:

tags/1.4.0

Files:

• . (modified) (1 prop)
• Game.pas (modified) (7 diffs)

tags/1.4.0/Game.pas

@@ -11 +11 @@
   DefaultPlayerStartUnits = 5;
   MinPlayerCount = 1;
-  MaxPlayerCount = 8;
+  MaxPlayerCount = 12;
   GameFileExt = '.xtg';
 
@@ -529 +529 @@
 begin
   with Config do begin
-    SetValue(DOMString(Path + '/RandSeed'), Integer(StoredRandSeed));
+    SetValue(DOMString(Path + '/RandSeed'), DOMString(IntToStr(StoredRandSeed)));
     SetValue(DOMString(Path + '/GridType'), Integer(MapType));
     SetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName));
@@ -558 +558 @@
 var
   Value: Integer;
+  ValueInt64: Int64;
 begin
   with Config do begin
-    StoredRandSeed := GetValue(DOMString(Path + '/RandSeed'), 0);
-    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagonVertical)));
-    Map.Size := TPoint.Create(GetValue(DOMString(Path + '/MapSizeX'), 10),
-      GetValue(DOMString(Path + '/MapSizeY'), 10));
+    if TryStrToInt64(string(GetValue(DOMString(Path + '/RandSeed'), DOMString(IntToStr(StoredRandSeed)))), ValueInt64) then
+      StoredRandSeed := ValueInt64;
+    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(MapType)));
+    Map.Size := TPoint.Create(GetValue(DOMString(Path + '/MapSizeX'), Map.Size.X),
+      GetValue(DOMString(Path + '/MapSizeY'), Map.Size.Y));
     MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
-    SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);
-    CyclicMap := GetValue(DOMString(Path + '/CyclicMap'), False);
-    FogOfWar := GetValue(DOMString(Path + '/FogOfWar'), False);
-    VoidEnabled := GetValue(DOMString(Path + '/VoidEnabled'), True);
-    VoidPercentage := GetValue(DOMString(Path + '/VoidPercentage'), 20);
-    Value := GetValue(DOMString(Path + '/MapShape'), 0);
+    SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), SymetricMap);
+    CyclicMap := GetValue(DOMString(Path + '/CyclicMap'), CyclicMap);
+    FogOfWar := GetValue(DOMString(Path + '/FogOfWar'), FogOfWar);
+    VoidEnabled := GetValue(DOMString(Path + '/VoidEnabled'), VoidEnabled);
+    VoidPercentage := GetValue(DOMString(Path + '/VoidPercentage'), VoidPercentage);
+    Value := GetValue(DOMString(Path + '/MapShape'), Integer(Map.Shape));
     if (Value >= Integer(Low(TMapShape))) and (Value <= Integer(High(TMapShape))) then
       Map.Shape := TMapShape(Value) else Map.Shape := Low(TMapShape);
-    CityEnabled := GetValue(DOMString(Path + '/CityEnabled'), False);
-    CityPercentage := GetValue(DOMString(Path + '/CityPercentage'), 10);
-    BridgeEnabled := GetValue(DOMString(Path + '/BridgeEnabled'), True);
-    Value := GetValue(DOMString(Path + '/GrowAmount'), Integer(gaBySquareRoot));
+    CityEnabled := GetValue(DOMString(Path + '/CityEnabled'), CityEnabled);
+    CityPercentage := GetValue(DOMString(Path + '/CityPercentage'), CityPercentage);
+    BridgeEnabled := GetValue(DOMString(Path + '/BridgeEnabled'), BridgeEnabled);
+    Value := GetValue(DOMString(Path + '/GrowAmount'), Integer(GrowAmount));
     if (Value >= Integer(Low(TGrowAmount))) and (Value <= Integer(High(TGrowAmount))) then
       GrowAmount := TGrowAmount(Value) else GrowAmount := Low(TGrowAmount);
-    Value := GetValue(DOMString(Path + '/GrowCells'), Integer(gcPlayerAll));
+    Value := GetValue(DOMString(Path + '/GrowCells'), Integer(GrowCells));
     if (Value >= Integer(Low(TGrowCells))) and (Value <= Integer(High(TGrowCells))) then
       GrowCells := TGrowCells(Value) else GrowCells := Low(TGrowCells);
-    Value := GetValue(DOMString(Path + '/WinObjective'), Integer(woDefeatAllOponents));
+    Value := GetValue(DOMString(Path + '/WinObjective'), Integer(WinObjective));
     if (Value >= Integer(Low(TWinObjective))) and (Value <= Integer(High(TWinObjective))) then
       WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
-    StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
-    SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1);
-    MaxNeutralUnits := GetValue(DOMString(Path + '/MaxNeutralUnits'), 5);
-    MaxPower := GetValue(DOMString(Path + '/MaxPower'), 99);
+    StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
+    SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount);
+    MaxNeutralUnits := GetValue(DOMString(Path + '/MaxNeutralUnits'), MaxNeutralUnits);
+    MaxPower := GetValue(DOMString(Path + '/MaxPower'), MaxPower);
     Players.LoadConfig(Config, Path + '/Players');
   end;
@@ -608 +610 @@
     RootNode := Doc.DocumentElement;
     with RootNode do begin
-      StoredRandSeed := ReadInteger(RootNode, 'RandSeed', 0);
+      StoredRandSeed := ReadInt64(RootNode, 'RandSeed', 0);
       MapType := TMapType(ReadInteger(RootNode, 'MapType', Integer(mtNone)));
       SymetricMap := ReadBoolean(RootNode, 'SymetricMap', False);
@@ -672 +674 @@
     AppendChild(RootNode);
     with RootNode do begin
-      WriteInteger(RootNode, 'RandSeed', Integer(StoredRandSeed));
+      StoredRandSeed := RandSeed;
+      WriteInt64(RootNode, 'RandSeed', StoredRandSeed);
       WriteInteger(RootNode, 'MapType', Integer(MapType));
       WriteBoolean(RootNode, 'SymetricMap', SymetricMap);
@@ -691 +694 @@
       WriteBoolean(RootNode, 'Running', Running);
       WriteInteger(RootNode, 'CurrentPlayer', CurrentPlayer.Id);
+
+      Units.RecalculateItemsId;
+      Players.RecalculateItemsId;
 
       NewNode := OwnerDocument.CreateElement('GameSystem');
@@ -910 +916 @@
 
   GeneratePlayers := True;
+  StoredRandSeed := RandSeed;
   MapImageFileName := '';
-  Randomize;
-  StoredRandSeed := RandSeed;
-  InitDefaultPlayers;
-
+  MapType := mtHexagonVertical;
+  Map.Size := TPoint.Create(10, 10);
+
+  CityPercentage := 20;
   VoidEnabled := True;
   VoidPercentage := 20;
   MaxPower := DefaultMaxPower;
   MaxNeutralUnits := Min(4, MaxPower);
-
-  Map.Size := TPoint.Create(3, 3);
+  BridgeEnabled := True;
+  MaxNeutralUnits := 5;
+  MaxPower := 99;
+  SpecialCaptureCellCount := 1;
+  StayAliveForDefinedTurns := 20;
+  WinObjective := woDefeatAllOponents;
+  GrowCells := gcPlayerAll;
+  GrowAmount := gaBySquareRoot;
+
+  InitDefaultPlayers;
 end;