Changeset 273 for trunk/UClientGUI.pas

Timestamp:

Jan 30, 2019, 8:08:44 AM (6 years ago)

Author:

chronos

Message:

• Added: Show units shape to see in which cell units are placed.
• Fixed: Do not place units with zero power in zero power cells.
• Fixed: Better checks of cell power if cell is without unit.

File:

• trunk/UClientGUI.pas (modified) (7 diffs)

trunk/UClientGUI.pas

@@ -49 +49 @@
   public
     View: TView;
-    ShowCellGrid: Boolean;
+    CellGridVisible: Boolean;
+    UnitShapeVisible: Boolean;
     procedure DrawArrow(Canvas: TCanvas; Pos: TPoint; Angle: Double;
       Text: string; View: TView);
@@ -110 +111 @@
   Points: array of Classes.TPoint;
   TextSize: TSize;
+  R: Integer;
 begin
   if Cell.MapCell.Extra = etObjectiveTarget then begin
@@ -118 +120 @@
     //Pen.Style := psClear;
     Pen.Style := psSolid;
-    if ShowCellGrid then begin
+    if CellGridVisible then begin
       Pen.Color := clBlack;
       Pen.Width := Round(2 * View.Zoom);
@@ -144 +146 @@
         Round(TextPos.Y) - TextSize.cy div 2, Text, False);
     end;
+    if UnitShapeVisible and Assigned(Cell.MapCell.OneUnit) then begin
+      TextPos := View.CellToCanvasPos(Pos);
+      R := Trunc(70 * View.Zoom);
+      Pen.Color := clWhite;
+      Pen.Style := psSolid;
+      Pen.Width := Round(10 * View.Zoom);
+      Brush.Style := bsClear;
+      TCanvasEx.Ellipse(Canvas, TRect.Create(
+        TPoint.Create(TextPos.X - R, TextPos.Y - R),
+        TPoint.Create(TextPos.X + R, TextPos.Y + R)
+      ));
+    end;
   end;
 end;
@@ -154 +168 @@
   Points: array of Classes.TPoint;
   TextSize: TSize;
+  R: Integer;
 begin
   if Cell.Extra = etObjectiveTarget then begin
@@ -188 +203 @@
 
     // Show cell text
-    if (Cell.OneUnit.Power <> 0) or (Cell.Extra = etObjectiveTarget) then begin
+    if Assigned(Cell.OneUnit) and (Cell.OneUnit.Power <> 0) or
+      (Cell.Extra = etObjectiveTarget) then begin
       Pen.Style := psSolid;
       Font.Color := clWhite;
@@ -197 +213 @@
       TCanvasEx.TextOutEx(Canvas, Round(TextPos.X) - TextSize.cx div 2,
         Round(TextPos.Y) - TextSize.cy div 2, Text, False);
+    end;
+    if UnitShapeVisible and Assigned(Cell.OneUnit) then begin
+      TextPos := View.CellToCanvasPos(Pos);
+      R := Trunc(70 * View.Zoom);
+      Pen.Color := clWhite;
+      Pen.Style := psSolid;
+      Pen.Width := Round(10 * View.Zoom);
+      Brush.Style := bsClear;
+      TCanvasEx.Ellipse(Canvas, TRect.Create(
+        TPoint.Create(TextPos.X - R, TextPos.Y - R),
+        TPoint.Create(TextPos.X + R, TextPos.Y + R)
+      ));
     end;
   end;