Changeset 83 for trunk

Timestamp:

Nov 5, 2014, 10:18:38 AM (10 years ago)

Author:

chronos

Message:

• Fixed: Loading game was not working after Fog of war modifications.
• Fixed: Show move arrows only for visible area.

Location:

trunk

Files:

• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (9 diffs)

trunk/UCore.pas

@@ -225 +225 @@
   if OpenDialog1.Execute then begin
     Game.LoadFromFile(OpenDialog1.FileName);
+    Player := Game.Players.GetFirstHuman;
     LastMapFileName := OpenDialog1.FileName;
     with Core.Game.CurrentPlayer do

trunk/UGame.pas

@@ -211 +211 @@
 
   TPlayerCells = class(TObjectList)
-
+    function SearchCell(Cell: TCell): TPlayerCell;
   end;
 
@@ -480 +480 @@
 end;
 
+{ TPlayerCells }
+
+function TPlayerCells.SearchCell(Cell: TCell): TPlayerCell;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TPlayerCell(Items[I]).MapCell <> Cell) do Inc(I);
+  if I < Count then Result := TPlayerCell(Items[I])
+    else Result := nil;
+end;
+
 { TPlayerMap }
 
@@ -554 +566 @@
           else if Player.Game.FogOfWar then begin
             if Cell.InVisibleRange then begin
-              if not Cell.Explored then begin
-                Brush.Color := HalfColor(Cell.MapCell.GetColor);
+              Brush.Color := Cell.MapCell.GetColor;
+            end else begin
+              if Cell.Explored then begin
+                Brush.Color := $404040;
                 CellText := '';
-              end else Brush.Color := Cell.MapCell.GetColor
-            end else begin
-              Brush.Color := clBlack;
-              CellText := '';
+              end else begin
+                Brush.Color := clBlack;
+                CellText := '';
+              end;
             end;
           end else Brush.Color := Cell.MapCell.GetColor;
@@ -577 +591 @@
       PosFrom := Player.Game.Map.CellToPos(Move.CellFrom);
       PosTo := Player.Game.Map.CellToPos(Move.CellTo);
+      // In Fog of war mode show only
+      if Game.FogOfWar and not Cells.SearchCell(Move.CellFrom).InVisibleRange and
+        not Cells.SearchCell(Move.CellTo).InVisibleRange then
+        Continue;
       if Move.CountRepeat > 0 then Pen.Width := 2
         else Pen.Width := 1;
@@ -2186 +2204 @@
 var
   NewNode: TDOMNode;
-  Value: Integer;
   Doc: TXMLDocument;
-  Dump: TStringList;
   RootNode: TDOMNode;
+  I: Integer;
 begin
   Self.FileName := FileName;
@@ -2226 +2243 @@
 
       Map.Cells.FixRefId;
+
+      for I := 0 to Players.Count - 1 do begin
+        TPlayer(Players[I]).PlayerMap.Update;
+        TPlayer(Players[I]).PlayerMap.CheckVisibility;
+      end;
     end;
   finally
@@ -2235 +2257 @@
 var
   NewNode: TDOMNode;
-  NewNode2: TDOMNode;
   Doc: TXMLDocument;
   RootNode: TDOMNode;
@@ -2322 +2343 @@
   Map.Grow(CurrentPlayer);
   UpdateRepeatMoves(CurrentPlayer);
-  CurrentPlayer.PlayerMap.CheckVisibility;
   ComputePlayerStats;
   PrevPlayer := CurrentPlayer;
@@ -2335 +2355 @@
   end;
   CheckWinObjective;
+  CurrentPlayer.PlayerMap.CheckVisibility;
   // For computers take view from previous human
   //if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);