Changeset 307 for trunk

Timestamp:

Aug 18, 2021, 11:18:39 AM (3 years ago)

Author:

chronos

Message:

• Fixed: EmptyCellsNeutral check.

Location:

trunk

Files:

• Systems/Dune 2.xts (modified) (1 diff)
• UMap.pas (modified) (2 diffs)
• UPlayer.pas (modified) (2 diffs)

trunk/Systems/Dune 2.xts

@@ -2 +2 @@
 <XtacticsGameSystem>
   <UnitsSplitMerge>0</UnitsSplitMerge>
-  <EmptyCellsNeutral>0</EmptyCellsNeutral>
+  <EmptyCellsNeutral>-1</EmptyCellsNeutral>
   <UnitsMoveImmediately>-1</UnitsMoveImmediately>
   <PreferedMapType>2</PreferedMapType>

trunk/UMap.pas

@@ -63 +63 @@
     function GetColor: TColor;
     function ToString: ansistring; override;
+    procedure CheckOwnership;
     constructor Create;
     destructor Destroy; override;
@@ -1119 +1120 @@
 end;
 
+procedure TCell.CheckOwnership;
+begin
+  if TGame(Map.Game).GameSystem.EmptyCellsNeutral then
+  if Assigned(Player) and  (Assigned(OneUnit) and (OneUnit.Power = 0)) or
+    not Assigned(OneUnit) then
+      Player := nil;
+end;
+
 constructor TCell.Create;
 begin

trunk/UPlayer.pas

@@ -973 +973 @@
     end;
     CellFrom.MapCell.OneUnit.Power := CellFrom.MapCell.OneUnit.Power - UnitCount;
+    CellFrom.MapCell.CheckOwnership;
   end;
 
@@ -1145 +1146 @@
   for I := 0 to PlayerMap.Cells.Count - 1 do
   with TPlayerCell(PlayerMap.Cells[I]) do begin
-    if Assigned(MapCell.OneUnit) and (MapCell.OneUnit.Power = 0) then
-      MapCell.Player := nil;
+    MapCell.CheckOwnership;
   end;
 end;