Changeset 164 for trunk/UGame.pas

Timestamp:

Nov 21, 2017, 6:39:06 PM (7 years ago)

Author:

chronos

Message:

• Modified: More work on voronoi type map generation.
• Fixed: Do not generate map twice on map config load.

File:

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

trunk/UGame.pas

@@ -174 +174 @@
   private
     FSize: TPoint;
+    FUpdateCount: Integer;
     function GetSize: TPoint; virtual;
     procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
@@ -213 +214 @@
     procedure CreateLinks;
     procedure Clear;
+    procedure BeginUpdate;
+    procedure EndUpdate;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -982 +985 @@
   CellText: string;
   CellLink: TCellLink;
+  NeighCell: TCell;
 begin
   with Canvas, View do
@@ -1028 +1032 @@
         Player.Game.Map.PaintCell(Canvas, Cell.MapCell.PosPx, '', View, Cell.MapCell);
       end;
+
+      {// Draw links to neighbors
+      for NeighCell in Cell.MapCell.Neighbors do begin
+        Pen.Color := clYellow;
+        MoveTo(View.CellToCanvasPos(Cell.MapCell.PosPx));
+        LineTo(View.CellToCanvasPos(NeighCell.PosPx));
+      end;
+      }
     end;
 
@@ -1340 +1352 @@
   if (FSize.X <> AValue.X) or (FSize.Y <> AValue.Y) then begin
     FSize := AValue;
-    Generate;
+    if FUpdateCount = 0 then Generate;
   end;
 end;
@@ -1434 +1446 @@
 //  I: Integer;
 begin
+  FUpdateCount := Source.FUpdateCount;
   MaxPower := Source.MaxPower;
   Game := Source.Game;
@@ -1713 +1726 @@
   Cells.Clear;
   FNewCellId := 1;
+end;
+
+procedure TMap.BeginUpdate;
+begin
+  Inc(FUpdateCount);
+end;
+
+procedure TMap.EndUpdate;
+begin
+  if FUpdateCount > 0 then Dec(FUpdateCount);
+  if FUpdateCount = 0 then Generate;
 end;
 
@@ -3217 +3241 @@
 begin
   with Config do begin
-    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
+    try
+      Map.BeginUpdate;
+      MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
+      Map.Size := Point(GetValue(DOMString(Path + '/MapSizeX'), 10),
+        GetValue(DOMString(Path + '/MapSizeY'), 10));
+    finally
+      Map.EndUpdate;
+    end;
     MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
     SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);
@@ -3223 +3254 @@
     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