Changeset 96 for trunk

Timestamp:

Dec 21, 2014, 11:14:58 PM (10 years ago)

Author:

chronos

Message:

• Modified: Removed old function GetAllCells which was used previously when Cells were arranged in Matrix rather then in generic list. Removed unnecessary all cells copy in Game.New.

File:

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

trunk/UGame.pas

@@ -153 +153 @@
     procedure Paint(Canvas: TCanvas; View: TView); virtual;
     function GetPixelRect: TRect; virtual;
-    function GetAllCells: TCellArray; virtual;
     procedure ForEachCells(Method: TMethod); virtual;
     property Size: TPoint read GetSize write SetSize;
@@ -1343 +1342 @@
 end;
 
-function TMap.GetAllCells: TCellArray;
-var
-  I: Integer;
-begin
-  SetLength(Result, Cells.Count);
-  for I := 0 to Cells.Count - 1do
-    Result[I] := TCell(Cells[I]);
-end;
-
 procedure TMap.ForEachCells(Method: TMethod);
 begin
@@ -2664 +2654 @@
   I: Integer;
   Counter: Integer;
-  AllCells: TCellArray;
   C: Integer;
 begin
@@ -2675 +2664 @@
     Map.Image.Picture.LoadFromFile(MapImageFileName);
   end;
-  AllCells := Map.GetAllCells;
-  for C := 0 to Length(AllCells) - 1 do
-  with AllCells[C] do begin
+  for C := 0 to Map.Cells.Count - 1 do
+  with TCell(Map.Cells[C]) do begin
     if (VoidEnabled and (Random < VoidPercentage / 100)) or
     (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
@@ -2707 +2695 @@
       while not Assigned(StartCell) or Assigned(StartCell.Player) or
      (StartCell.Terrain = ttVoid) do begin
-        StartCell := AllCells[Random(Length(AllCells))];
+        StartCell := TCell(Map.Cells[Random(Map.Cells.Count)]);
         Inc(Counter);
         if Counter > 100 then