Changeset 548 for trunk/LocalPlayer/IsoEngine.pas

Timestamp:

Apr 21, 2024, 10:57:18 AM (4 weeks ago)

Author:

chronos

Message:

• Fixed: Bad unit drawing in battle dialog.
• Modified: Code cleanup.

File:

• trunk/LocalPlayer/IsoEngine.pas (modified) (5 diffs)

trunk/LocalPlayer/IsoEngine.pas

@@ -36 +36 @@
       Diry: array [0..7] of Integer = (-1, 0, 1, 2, 1, 0, -1, -2);
     procedure CityGrid(xm, ym: Integer; CityAllowClick: Boolean);
+    procedure ClippedLine(X, Y, dx0, dy0: Integer; Mirror: Boolean);
     function IsShoreTile(Loc: Integer): Boolean;
     procedure MakeDark(Line: PPixelPointer; Length: Integer);
@@ -1053 +1054 @@
   CityInfo: TCityInfo;
   UnitInfo: TUnitInfo;
-  fog: Boolean;
+  Fog: Boolean;
   SpecialRow: Integer;
   SpecialCol: Integer;
@@ -1192 +1193 @@
 
   if moEditMode in MapOptions then
-    fog := (Loc < 0) or (Loc >= G.lx * G.ly)
-    // else if CityLoc>=0 then
-    // fog:= (Loc<0) or (Loc>=G.lx*G.ly) or (Distance(Loc,CityLoc)>5)
+    Fog := (Loc < 0) or (Loc >= G.lx * G.ly)
+    // else if CityLoc >= 0 then
+    // Fog:= (Loc < 0) or (Loc >= G.lx * G.ly) or (Distance(Loc, CityLoc) > 5)
   else if ShowGrWall then
-    fog := Tile and fGrWall = 0
+    Fog := Tile and fGrWall = 0
   else
-    fog := FoW and (Tile and fObserved = 0);
-  if fog and ShowObjects then
+    Fog := FoW and (Tile and fObserved = 0);
+  if Fog and ShowObjects then
     if Loc < -G.lx then
       Sprite(HGrTerrain, X, Y + yyt, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
@@ -1298 +1299 @@
 end;
 
+procedure TIsoMap.ClippedLine(X, Y, dx0, dy0: Integer; Mirror: Boolean);
+var
+  x0, x1, dxmin, dymin, dxmax, dymax, N: Integer;
+begin
+  with FOutput.Canvas do
+  begin
+    dxmin := (FLeft - X) div xxt;
+    dymin := (RealTop - Y) div yyt;
+    dxmax := (FRight - X - 1) div xxt + 1;
+    dymax := (RealBottom - Y - 1) div yyt + 1;
+    N := dymax - dy0;
+    if Mirror then
+    begin
+      if dx0 - dxmin < N then
+        N := dx0 - dxmin;
+      if dx0 > dxmax then
+      begin
+        N := N - (dx0 - dxmax);
+        dy0 := dy0 + (dx0 - dxmax);
+        dx0 := dxmax;
+      end;
+      if dy0 < dymin then
+      begin
+        N := N - (dymin - dy0);
+        dx0 := dx0 - (dymin - dy0);
+        dy0 := dymin;
+      end;
+    end
+    else
+    begin
+      if dxmax - dx0 < N then
+        N := dxmax - dx0;
+      if dx0 < dxmin then
+      begin
+        N := N - (dxmin - dx0);
+        dy0 := dy0 + (dxmin - dx0);
+        dx0 := dxmin;
+      end;
+      if dy0 < dymin then
+      begin
+        N := N - (dymin - dy0);
+        dx0 := dx0 + (dymin - dy0);
+        dy0 := dymin;
+      end;
+    end;
+    if N <= 0 then
+      Exit;
+    if Mirror then
+    begin
+      x0 := X + dx0 * xxt - 1;
+      x1 := X + (dx0 - N) * xxt - 1;
+    end
+    else
+    begin
+      x0 := X + dx0 * xxt;
+      x1 := X + (dx0 + N) * xxt;
+    end;
+    MoveTo(x0, Y + dy0 * yyt);
+    LineTo(x1, Y + (dy0 + N) * yyt);
+  end;
+end;
+
 procedure TIsoMap.PaintGrid(X, Y, nx, ny: Integer);
-
-  procedure ClippedLine(dx0, dy0: Integer; Mirror: Boolean);
-  var
-    x0, x1, dxmin, dymin, dxmax, dymax, N: Integer;
-  begin
-    with FOutput.Canvas do
-    begin
-      dxmin := (FLeft - X) div xxt;
-      dymin := (RealTop - Y) div yyt;
-      dxmax := (FRight - X - 1) div xxt + 1;
-      dymax := (RealBottom - Y - 1) div yyt + 1;
-      N := dymax - dy0;
-      if Mirror then
-      begin
-        if dx0 - dxmin < N then
-          N := dx0 - dxmin;
-        if dx0 > dxmax then
-        begin
-          N := N - (dx0 - dxmax);
-          dy0 := dy0 + (dx0 - dxmax);
-          dx0 := dxmax;
-        end;
-        if dy0 < dymin then
-        begin
-          N := N - (dymin - dy0);
-          dx0 := dx0 - (dymin - dy0);
-          dy0 := dymin;
-        end;
-      end
-      else
-      begin
-        if dxmax - dx0 < N then
-          N := dxmax - dx0;
-        if dx0 < dxmin then
-        begin
-          N := N - (dxmin - dx0);
-          dy0 := dy0 + (dxmin - dx0);
-          dx0 := dxmin;
-        end;
-        if dy0 < dymin then
-        begin
-          N := N - (dymin - dy0);
-          dx0 := dx0 + (dymin - dy0);
-          dy0 := dymin;
-        end;
-      end;
-      if N <= 0 then
-        Exit;
-      if Mirror then
-      begin
-        x0 := X + dx0 * xxt - 1;
-        x1 := X + (dx0 - N) * xxt - 1;
-      end
-      else
-      begin
-        x0 := X + dx0 * xxt;
-        x1 := X + (dx0 + N) * xxt;
-      end;
-      MoveTo(x0, Y + dy0 * yyt);
-      LineTo(x1, Y + (dy0 + N) * yyt);
-    end;
-  end;
-
 var
   I: Integer;
 begin
-  FOutput.Canvas.pen.Color := $000000; // $FF shl (8 * Random(3));
+  FOutput.Canvas.Pen.Color := $000000; // $FF shl (8 * Random(3));
   for I := 0 to nx div 2 do
-    ClippedLine(I * 2, 0, False);
+    ClippedLine(X, Y, I * 2, 0, False);
   for I := 1 to (nx + 1) div 2 do
-    ClippedLine(I * 2, 0, True);
+    ClippedLine(X, Y, I * 2, 0, True);
   for I := 0 to ny div 2 do
   begin
-    ClippedLine(0, 2 * I + 2, False);
-    ClippedLine(nx + 1, 2 * I + 1 + nx and 1, True);
+    ClippedLine(X, Y, 0, 2 * I + 2, False);
+    ClippedLine(X, Y, nx + 1, 2 * I + 1 + nx and 1, True);
   end;
 end;
@@ -1425 +1425 @@
     if Abs(y_n) < rShade then begin
       // Darken left and right parts of elipsis
-      w_n := sqrt(sqr(rShade) - sqr(y_n));
-      wBright := trunc(w_n * xxt + 0.5);
+      w_n := Sqrt(Sqr(rShade) - Sqr(y_n));
+      wBright := Trunc(w_n * xxt + 0.5);
       Line.SetX(0);
       MakeDark(@Line, ScaleToNative(xm - wBright));