Changeset 145 for trunk/UGame.pas

Timestamp:

Nov 12, 2017, 1:47:20 PM (6 years ago)

Author:

chronos

Message:

• Modified: Do not create settings form on application start but just if form is opened.
• Fixed: Removed various compilation warnings.

File:

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

trunk/UGame.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, ExtCtrls, Graphics, Contnrs, XMLConf, XMLRead, XMLWrite,
-  DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf;
+  DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf, fgl;
 
 const
@@ -417 +417 @@
     procedure BuildMapAreas;
     procedure InitClients;
+    procedure SelectPlayerStartCell(Player: TPlayer);
   public
     Players: TPlayers;
@@ -1302 +1303 @@
 
 procedure TMap.Assign(Source: TMap);
-var
-  I: Integer;
+//var
+//  I: Integer;
 begin
   MaxPower := Source.MaxPower;
@@ -1354 +1355 @@
 var
   NewNode: TDOMNode;
-  NewNode2: TDOMNode;
-  I: Integer;
 begin
   WriteInteger(Node, 'DefaultCellSizeX', DefaultCellSize.X);
@@ -1489 +1488 @@
 var
   X, Y: Integer;
-  I: Integer;
   NewCell: TCell;
 begin
@@ -1712 +1710 @@
   Node2: TDOMNode;
   Node3: TDOMNode;
-  NewCell: TCell;
 begin
   Id := ReadInteger(Node, 'Id', 0);
@@ -1979 +1976 @@
   AttackPower: Integer;
   TotalAttackPower: Integer;
-  I, J: Integer;
+  I: Integer;
   C: Integer;
   CanAttack: Integer;
   TargetCells: TCells;
-  S: string;
 const
   AttackDiff = 1;
@@ -2041 +2037 @@
   AttackPower: Integer;
   TotalAttackPower: Integer;
-  I, J: Integer;
+  I: Integer;
   C: Integer;
   CanAttack: Integer;
   TargetCells: TCells;
-  S: string;
-const
-  AttackDiff = 2;
 begin
   if Game.CurrentPlayer.Defensive then Exit;
@@ -2371 +2364 @@
 { TGame }
 
-function ComparePointer(Item1, Item2: Pointer): Integer;
-begin
-  Result := -CompareValue(Integer(Item1), Integer(Item2));
+function ComparePointer(const Item1, Item2: Integer): Integer;
+begin
+  Result := -CompareValue(Item1, Item2);
 end;
 
@@ -2382 +2375 @@
   S: string;
   I: Integer;
-  AttackRolls: TList;
-  DefendRolls: TList;
-begin
-  AttackRolls := TList.Create;
-  DefendRolls := TList.Create;
+  AttackRolls: TFPGList<Integer>;
+  DefendRolls: TFPGList<Integer>;
+begin
+  AttackRolls := TFPGList<Integer>.Create;
+  DefendRolls := TFPGList<Integer>.Create;
   if AttackPower < 1 then
     raise Exception.Create('Attacker power have to be higher then 0.');
@@ -2400 +2393 @@
     AttackRolls.Count := AttackerDiceCount;
     for I := 0 to AttackerDiceCount - 1 do begin
-      AttackRolls[I] := Pointer(Random(7));
+      AttackRolls[I] := Random(7);
     end;
     AttackRolls.Sort(ComparePointer);
@@ -2408 +2401 @@
     DefendRolls.Count := DefenderDiceCount;
     for I := 0 to DefenderDiceCount - 1 do begin
-      DefendRolls[I] := Pointer(Random(7));
+      DefendRolls[I] := Random(7);
     end;
     DefendRolls.Sort(ComparePointer);
@@ -2825 +2818 @@
 end;
 
+procedure TGame.SelectPlayerStartCell(Player: TPlayer);
+var
+  Counter: Integer;
+begin
+  with Player do begin
+    // Try to obtain start cell for each player
+    StartCell := nil;
+    Counter := 0;
+    while not Assigned(StartCell) or Assigned(StartCell.Player) or
+    (StartCell.Terrain = ttVoid) do begin
+      StartCell := TCell(Map.Cells[Random(Map.Cells.Count)]);
+      Inc(Counter);
+      if Counter > 100 then
+        raise Exception.Create(SCannotSetPlayerStartCells);
+    end;
+  end;
+end;
+
 procedure TGame.SaveConfig(Config: TXmlConfig; Path: string);
 begin
   with Config do begin
-    SetValue(Path + '/GridType', Integer(MapType));
-    SetValue(Path + '/MapImage', MapImageFileName);
-    SetValue(Path + '/SymetricMap', SymetricMap);
-    SetValue(Path + '/FogOfWar', FogOfWar);
-    SetValue(Path + '/VoidEnabled', VoidEnabled);
-    SetValue(Path + '/VoidPercentage', VoidPercentage);
-    SetValue(Path + '/MapSizeX', Map.Size.X);
-    SetValue(Path + '/MapSizeY', Map.Size.Y);
-    SetValue(Path + '/MapShape', Integer(Map.Shape));
-    SetValue(Path + '/CityEnabled', CityEnabled);
-    SetValue(Path + '/CityPercentage', CityPercentage);
-    SetValue(Path + '/BridgeEnabled', BridgeEnabled);
-    SetValue(Path + '/GrowAmount', Integer(GrowAmount));
-    SetValue(Path + '/GrowCells', Integer(GrowCells));
-    SetValue(Path + '/WinObjective', Integer(WinObjective));
+    SetValue(DOMString(Path + '/GridType'), Integer(MapType));
+    SetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName));
+    SetValue(DOMString(Path + '/SymetricMap'), SymetricMap);
+    SetValue(DOMString(Path + '/FogOfWar'), FogOfWar);
+    SetValue(DOMString(Path + '/VoidEnabled'), VoidEnabled);
+    SetValue(DOMString(Path + '/VoidPercentage'), VoidPercentage);
+    SetValue(DOMString(Path + '/MapSizeX'), Map.Size.X);
+    SetValue(DOMString(Path + '/MapSizeY'), Map.Size.Y);
+    SetValue(DOMString(Path + '/MapShape'), Integer(Map.Shape));
+    SetValue(DOMString(Path + '/CityEnabled'), CityEnabled);
+    SetValue(DOMString(Path + '/CityPercentage'), CityPercentage);
+    SetValue(DOMString(Path + '/BridgeEnabled'), BridgeEnabled);
+    SetValue(DOMString(Path + '/GrowAmount'), Integer(GrowAmount));
+    SetValue(DOMString(Path + '/GrowCells'), Integer(GrowCells));
+    SetValue(DOMString(Path + '/WinObjective'), Integer(WinObjective));
   end;
 end;
@@ -2851 +2862 @@
 begin
   with Config do begin
-    MapType := TMapType(GetValue(Path + '/GridType', Integer(mtHexagon)));
-    MapImageFileName := GetValue(Path + '/MapImage', MapImageFileName);
-    SymetricMap := GetValue(Path + '/SymetricMap', False);
-    FogOfWar := GetValue(Path + '/FogOfWar', False);
-    VoidEnabled := GetValue(Path + '/VoidEnabled', True);
-    VoidPercentage := GetValue(Path + '/VoidPercentage', 20);
-    Map.Size := Point(GetValue(Path + '/MapSizeX', 10),
-      GetValue(Path + '/MapSizeY', 10));
-    Value := GetValue(Path + '/MapShape', 0);
+    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
+    MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
+    SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);
+    FogOfWar := GetValue(DOMString(Path + '/FogOfWar'), False);
+    VoidEnabled := GetValue(DOMString(Path + '/VoidEnabled'), True);
+    VoidPercentage := GetValue(DOMString(Path + '/VoidPercentage'), 20);
+    Map.Size := Point(GetValue(DOMString(Path + '/MapSizeX'), 10),
+      GetValue(DOMString(Path + '/MapSizeY'), 10));
+    Value := GetValue(DOMString(Path + '/MapShape'), 0);
     if (Value >= Integer(Low(TMapShape))) and (Value <= Integer(High(TMapShape))) then
       Map.Shape := TMapShape(Value) else Map.Shape := Low(TMapShape);
-    CityEnabled := GetValue(Path + '/CityEnabled', False);
-    CityPercentage := GetValue(Path + '/CityPercentage', 10);
-    BridgeEnabled := GetValue(Path + '/BridgeEnabled', True);
-    Value := GetValue(Path + '/GrowAmount', Integer(gaBySquareRoot));
+    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));
     if (Value >= Integer(Low(TGrowAmount))) and (Value <= Integer(High(TGrowAmount))) then
       GrowAmount := TGrowAmount(Value) else GrowAmount := Low(TGrowAmount);
-    Value := GetValue(Path + '/GrowCells', Integer(gcPlayerAll));
+    Value := GetValue(DOMString(Path + '/GrowCells'), Integer(gcPlayerAll));
     if (Value >= Integer(Low(TGrowCells))) and (Value <= Integer(High(TGrowCells))) then
       GrowCells := TGrowCells(Value) else GrowCells := Low(TGrowCells);
-    Value := GetValue(Path + '/WinObjective', Integer(woDefeatAllOponents));
+    Value := GetValue(DOMString(Path + '/WinObjective'), Integer(woDefeatAllOponents));
     if (Value >= Integer(Low(TWinObjective))) and (Value <= Integer(High(TWinObjective))) then
       WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
@@ -2885 +2896 @@
 begin
   Self.FileName := FileName;
-  ReadXMLFile(Doc, UTF8Decode(FileName));
+  ReadXMLFile(Doc, FileName);
   with Doc do try
     if Doc.DocumentElement.NodeName <> 'XtacticsGame' then
@@ -2974 +2985 @@
   end;
     ForceDirectoriesUTF8(ExtractFileDir(FileName));
-    WriteXMLFile(Doc, UTF8Decode(FileName));
+    WriteXMLFile(Doc, FileName);
   finally
     Doc.Free;
@@ -3136 +3147 @@
 var
   I: Integer;
-  Counter: Integer;
   C: Integer;
   LastAreaCount: Integer;
@@ -3172 +3182 @@
     PlayerMap.Update;
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
-      // Try to obtain start cell for each player
-      StartCell := nil;
-      Counter := 0;
-      while not Assigned(StartCell) or Assigned(StartCell.Player) or
-     (StartCell.Terrain = ttVoid) do begin
-        StartCell := TCell(Map.Cells[Random(Map.Cells.Count)]);
-        Inc(Counter);
-        if Counter > 100 then
-          raise Exception.Create(SCannotSetPlayerStartCells);
-      end;
+      SelectPlayerStartCell(TPlayer(Players[I]));
       if SymetricMap and (I = 1) then
         StartCell := TCell(Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(TPlayer(Players[0]).StartCell)]);