Changeset 167 for trunk/UGame.pas

Timestamp:

Nov 23, 2017, 9:57:48 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Generate map only once on application start.
• Modified: Use const function parameter modifier in Geometry unit.

File:

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

trunk/UGame.pas

@@ -188 +188 @@
   private
     FSize: TPoint;
-    FUpdateCount: Integer;
     function GetSize: TPoint; virtual;
     procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
@@ -229 +228 @@
     procedure CreateLinks;
     procedure Clear;
-    procedure BeginUpdate;
-    procedure EndUpdate;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -1388 +1385 @@
   if (FSize.X <> AValue.X) or (FSize.Y <> AValue.Y) then begin
     FSize := AValue;
-    if FUpdateCount = 0 then Generate;
   end;
 end;
@@ -1504 +1500 @@
 //  I: Integer;
 begin
-  FUpdateCount := Source.FUpdateCount;
   MaxPower := Source.MaxPower;
   Game := Source.Game;
@@ -1784 +1779 @@
   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;
 
@@ -3317 +3301 @@
 begin
   with Config do begin
-    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;
+    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
+    Map.Size := Point(GetValue(DOMString(Path + '/MapSizeX'), 10),
+      GetValue(DOMString(Path + '/MapSizeY'), 10));
     MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
     SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);