Changeset 79 for trunk/UGame.pas

Timestamp:

Nov 4, 2014, 8:57:21 AM (10 years ago)

Author:

chronos

Message:

• Removed: Useless old method GetCellNeighbors. Cell neigbours can be now accessed directly.
• Modified: Optimized canvas TextOut to not move pointer after text displaying.
• Fixed: Computer inner moves were calculated incorrectly multiple times for same cells. This was slowing down calculation in particular for large maps.
• Added: Used PersistentForm component to keep forms position and size. So far it not supports xmlconfig class.

File:

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

trunk/UGame.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, ExtCtrls, Graphics, Contnrs, XMLConf, XMLRead, XMLWrite,
-  DOM, Math, FileUtil, UXMLUtils, Dialogs, Types;
+  DOM, Math, FileUtil, UXMLUtils, Dialogs, Types, LCLType, LCLIntf;
 
 const
@@ -105 +105 @@
     property DestRect: TRect read FDestRect write SetDestRect;
     property Zoom: Double read FZoom write SetZoom;
+  end;
+
+  { TCanvasEx }
+
+  TCanvasEx = class(TCanvas)
+    procedure TextOutEx(X,Y: Integer; const Text: string; MovePen: Boolean = True);
   end;
 
@@ -144 +150 @@
     constructor Create; virtual;
     destructor Destroy; override;
-    function GetCellNeighbors(Cell: TCell): TCellArray; virtual;
     procedure Paint(Canvas: TCanvas; View: TView); virtual;
     function GetPixelRect: TRect; virtual;
@@ -436 +441 @@
 end;
 
+{ TCanvasEx }
+
+procedure TCanvasEx.TextOutEx(X, Y: Integer; const Text: string;
+  MovePen: Boolean);
+var
+  Flags : Cardinal;
+begin
+  Changing;
+  RequiredState([csHandleValid, csFontValid, csBrushValid]);
+  Flags := 0;
+  if TextStyle.Opaque then
+    Flags := ETO_Opaque;
+  ExtUTF8Out(Handle, X, Y, Flags, nil, PChar(Text), Length(Text), nil);
+  if MovePen then MoveTo(X + TextWidth(Text), Y);
+  Changed;
+end;
+
 { TCells }
 
@@ -956 +978 @@
     Brush.Style := bsSolid;
     Polygon(Points, False, 0, Length(Points));
+
+    // Show cell text
     Pen.Style := psSolid;
     Font.Color := clWhite;
@@ -962 +986 @@
     TextPos := View.CellToCanvasPos(Pos);
     TextSize := TextExtent(Text);
-    TextOut(Round(TextPos.X) - TextSize.cx div 2, Round(TextPos.Y) - TextSize.cy div 2, Text);
+    TCanvasEx(Canvas).TextOutEx(Round(TextPos.X) - TextSize.cx div 2,
+      Round(TextPos.Y) - TextSize.cy div 2, Text, False);
   end;
 end;
@@ -1019 +1044 @@
   FreeAndNil(Cells);
   inherited Destroy;
-end;
-
-function TMap.GetCellNeighbors(Cell: TCell): TCellArray;
-var
-  I: Integer;
-begin
-  SetLength(Result, Cell.Neighbors.Count);
-  for I := 0 to Length(Result) - 1 do
-    Result[I] := TCell(Cell.Neighbors[I]);
 end;
 
@@ -1411 +1427 @@
 var
   AllCells: TCells;
-  Cells, Cells2: TCellArray;
   TotalPower: Integer;
   AttackPower: Integer;
@@ -1417 +1432 @@
   I, J: Integer;
   C: Integer;
-  CanAttack, CanAttack2: Integer;
+  CanAttack: Integer;
   TargetCells: TCells;
   S: string;
@@ -1431 +1446 @@
   with TCell(AllCells[C]) do begin
     if (Terrain <> ttVoid) and (Player = nil) then begin
-      Cells := Game.Map.GetCellNeighbors(TCell(AllCells[C]));
       CanAttack := 0;
-      for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player = Game.CurrentPlayer) then begin
+      for I := 0 to Neighbors.Count - 1 do
+      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
         Inc(CanAttack);
       end;
@@ -1449 +1463 @@
       // Attack to not owned cell yet
       // Count own possible power
-      Cells := Game.Map.GetCellNeighbors(TCell(TargetCells[C]));
       TotalPower := 0;
-      for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player = Game.CurrentPlayer) then begin
-        TotalPower := TotalPower + Cells[I].GetAvialPower;
+      for I := 0 to Neighbors.Count - 1 do
+      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
+        TotalPower := TotalPower + TCell(Neighbors[I]).GetAvialPower;
       end;
       // Attack if target is weaker
       if TotalPower >= (Power + AttackDiff) then begin
         TotalAttackPower := 0;
-        for I := 0 to Length(Cells) - 1 do
-        if (Cells[I].Player = Game.CurrentPlayer) then begin
+        for I := 0 to Neighbors.Count - 1 do
+        if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
           // Use only necessary power
           AttackPower := Power - TotalAttackPower + AttackDiff;
-          if Cells[I].GetAvialPower < AttackPower then
-            AttackPower := Cells[I].GetAvialPower;
-          Game.SetMove(Cells[I], TCell(TargetCells[C]), AttackPower);
+          if TCell(Neighbors[I]).GetAvialPower < AttackPower then
+            AttackPower := TCell(Neighbors[I]).GetAvialPower;
+          Game.SetMove(Tcell(Neighbors[I]), TCell(TargetCells[C]), AttackPower);
           TotalAttackPower := TotalAttackPower + AttackPower;
         end;
@@ -1476 +1489 @@
 var
   AllCells: TCells;
-  Cells, Cells2: TCellArray;
   TotalPower: Integer;
   AttackPower: Integer;
@@ -1482 +1494 @@
   I, J: Integer;
   C: Integer;
-  CanAttack, CanAttack2: Integer;
+  CanAttack: Integer;
   TargetCells: TCells;
   S: string;
@@ -1496 +1508 @@
   with TCell(AllCells[C]) do begin
     if (Terrain <> ttVoid) and (Player <> Game.CurrentPlayer) and (Player <> nil) then begin
-      Cells := Game.Map.GetCellNeighbors(TCell(AllCells[C]));
       CanAttack := 0;
-      for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player = Game.CurrentPlayer) then begin
+      for I := 0 to Neighbors.Count - 1 do
+      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
         Inc(CanAttack);
       end;
@@ -1514 +1525 @@
       // Attack to not owned cell yet
       // Count own possible power
-      Cells := Game.Map.GetCellNeighbors(TCell(TargetCells[C]));
       TotalPower := 0;
-      for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player = Game.CurrentPlayer) then begin
-        TotalPower := TotalPower + Cells[I].GetAvialPower;
+      for I := 0 to Neighbors.Count - 1 do
+      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
+        TotalPower := TotalPower + TCell(Neighbors[I]).GetAvialPower;
       end;
       // Attack if target is weaker
       if TotalPower >= (Power + AttackDiff) then begin
         TotalAttackPower := 0;
-        for I := 0 to Length(Cells) - 1 do
-        if (Cells[I].Player = Game.CurrentPlayer) then begin
+        for I := 0 to Neighbors.Count - 1 do
+        if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
           // Use only necessary power
           AttackPower := Power - TotalAttackPower + AttackDiff;
-          if Cells[I].GetAvialPower < AttackPower then
-            AttackPower := Cells[I].GetAvialPower;
-          Game.SetMove(Cells[I], TCell(TargetCells[C]), AttackPower);
+          if TCell(Neighbors[I]).GetAvialPower < AttackPower then
+            AttackPower := TCell(Neighbors[I]).GetAvialPower;
+          Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), AttackPower);
           TotalAttackPower := TotalAttackPower + AttackPower;
         end;
@@ -1541 +1551 @@
 var
   AllCells: TCells;
-  Cells, Cells2: TCellArray;
   I, J: Integer;
   C: Integer;
-  CanAttack, CanAttack2: Integer;
+  CanAttack: Integer;
   TargetCells: TCells;
   NewTargetCells: TCells;
+  Cells2: TCells;
 begin
   // We need to move available power to borders to be available for attacks
@@ -1560 +1570 @@
   with TCell(AllCells[C]) do begin
     if (Player <> Game.CurrentPlayer) and (Player <> nil) and (Terrain <> ttVoid) then begin
-      Cells := Game.Map.GetCellNeighbors(TCell(AllCells[C]));
       CanAttack := 0;
-      for I := 0 to Length(Cells) - 1 do
-      if ((Cells[I].Player = Game.CurrentPlayer) or (Cells[I].Player = nil)) and (Cells[I].Terrain <> ttVoid) then begin
+      for I := 0 to Neighbors.Count - 1 do
+      if ((TCell(Neighbors[I]).Player = Game.CurrentPlayer) or
+      (TCell(Neighbors[I]).Player = nil)) and (TCell(Neighbors[I]).Terrain <> ttVoid) then begin
         Inc(CanAttack);
       end;
@@ -1583 +1593 @@
     for C := 0 to TargetCells.Count - 1 do
     with TCell(TargetCells[C]) do begin
-      Cells := Game.Map.GetCellNeighbors(TCell(TargetCells[C]));
-      for I := 0 to Length(Cells) - 1 do begin
-        if (Cells[I].Terrain <> ttVoid) and (not Cells[I].Mark) then begin
+      for I := 0 to Neighbors.Count - 1 do begin
+        if (TCell(Neighbors[I]).Terrain <> ttVoid) and (not TCell(Neighbors[I]).Mark) then begin
           if (TCell(TargetCells[C]).Player = Game.CurrentPlayer) and
-          (Cells[I].Player = Game.CurrentPlayer) then begin
+          (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
             // Do not take units from front line
-            Cells2 := Game.Map.GetCellNeighbors(TCell(Cells[I]));
+            Cells2 := TCell(Neighbors[I]).Neighbors;
             CanAttack := 0;
-            for J := 0 to Length(Cells2) - 1 do
-            if ((Cells2[J].Player <> Game.CurrentPlayer) or (Cells2[J].Player = nil))
-            and (Cells2[J].Terrain <> ttVoid) then begin
+            for J := 0 to Cells2.Count - 1 do
+            if ((TCell(Cells2[J]).Player <> Game.CurrentPlayer) or (TCell(Cells2[J]).Player = nil))
+            and (TCell(Cells2[J]).Terrain <> ttVoid) then begin
               Inc(CanAttack);
             end;
             if CanAttack = 0 then
-              Game.SetMove(Cells[I], TCell(TargetCells[C]), Cells[I].GetAvialPower);
+              Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), TCell(Neighbors[I]).GetAvialPower);
           end;
-          TCell(TargetCells[C]).Mark := True;
-          NewTargetCells.Add(Cells[I]);
+          TCell(Neighbors[I]).Mark := True;
+          NewTargetCells.Add(TCell(Neighbors[I]));
         end;
       end;
@@ -1606 +1615 @@
 
     // Use source cells NewTargetCells as new TargetCells
-    TargetCells.Count := NewTargetCells.Count;
-    for C := 0 to TargetCells.Count - 1 do
-      TargetCells[C] := NewTargetCells[C];
+    TargetCells.Free;
+    TargetCells := NewTargetCells;
+    NewTargetCells := TCells.Create;
+    NewTargetCells.OwnsObjects := False;
   end;