Changeset 522 for trunk/LocalPlayer

Timestamp:

Jan 7, 2024, 10:24:51 PM (11 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.
• Added: High DPI aware SetWindowPos function.

Location:

trunk/LocalPlayer

Files:

• ClientTools.pas (modified) (2 diffs)
• Diagram.pas (modified) (1 diff)
• IsoEngine.pas (modified) (2 diffs)
• Nego.pas (modified) (4 diffs)
• Select.pas (modified) (2 diffs)
• Term.pas (modified) (10 diffs)

trunk/LocalPlayer/ClientTools.pas

@@ -100 +100 @@
   Inc(Loc0, G.lx * 1024);
   Inc(Loc1, G.lx * 1024);
-  dx := abs(((Loc1 mod G.lx * 2 + Loc1 div G.lx and 1) -
+  dx := Abs(((Loc1 mod G.lx * 2 + Loc1 div G.lx and 1) -
     (Loc0 mod G.lx * 2 + Loc0 div G.lx and 1) + 3 * G.lx) mod (2 * G.lx) - G.lx);
-  dy := abs(Loc1 div G.lx - Loc0 div G.lx);
-  Result := dx + dy + abs(dx - dy) shr 1;
+  dy := Abs(Loc1 div G.lx - Loc0 div G.lx);
+  Result := dx + dy + Abs(dx - dy) shr 1;
 end;
 
@@ -371 +371 @@
       for dx := -2 to 2 do
         for dy := -2 to 2 do
-          if abs(dx) + abs(dy) = 2 then
+          if Abs(dx) + Abs(dy) = 2 then
             if Server(sMoveUnit - sExecute + dx and 7 shl 4 + dy and
               7 shl 7, Me, uix, nil^) >= rExecuted then

trunk/LocalPlayer/Diagram.pas

@@ -219 +219 @@
         MoveTo(X, Border);
         LineTo(X, InnerHeight - Border);
-        S := IntToStr(abs(TurnToYear(T * LineStep)));
+        S := IntToStr(Abs(TurnToYear(T * LineStep)));
         Textout(X - TextWidth(S) div 2, Border - 16, S);
       end;

trunk/LocalPlayer/IsoEngine.pas

@@ -1372 +1372 @@
   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);
@@ -1430 +1430 @@
   for Y := 0 to ScaleToNative(Height) - 1 do begin
     y_n := (ScaleFromNative(Y) + y0 - ym) / yyt;
-    if abs(y_n) < rShade then begin
+    if Abs(y_n) < rShade then begin
       // Darken left and right parts of elipsis
       w_n := sqrt(sqr(rShade) - sqr(y_n));

trunk/LocalPlayer/Nego.pas

@@ -746 +746 @@
           if InputDlg.ModalResult <> mrOK then
             Exit;
-          val(InputDlg.EditInput.Text, A, I);
+          Val(InputDlg.EditInput.Text, A, I);
           if (I <> 0) or (A <= 0) or (A >= MaxMoneyPrice) then
             Exit;
@@ -776 +776 @@
           if InputDlg.ModalResult <> mrOK then
             Exit;
-          val(InputDlg.EditInput.Text, A, I);
+          Val(InputDlg.EditInput.Text, A, I);
           if (I <> 0) or (A <= 0) then
             Exit;
@@ -858 +858 @@
           if InputDlg.ModalResult <> mrOK then
             Exit;
-          val(InputDlg.EditInput.Text, A, I);
+          Val(InputDlg.EditInput.Text, A, I);
           if (I <> 0) or (A <= 0) or (A >= MaxMoneyPrice) then
             Exit;
@@ -878 +878 @@
           if InputDlg.ModalResult <> mrOK then
             Exit;
-          val(InputDlg.EditInput.Text, A, I);
+          Val(InputDlg.EditInput.Text, A, I);
           if (I <> 0) or (A <= 0) then
             Exit;

trunk/LocalPlayer/Select.pas

@@ -8 +8 @@
   SysUtils, Classes, ButtonB, ButtonBase, Types,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus,
-  System.UITypes{$ELSE}
+  Dpi.Common, System.UITypes{$ELSE}
   Graphics, Controls, Forms, ExtCtrls, Menus{$ENDIF};
 
@@ -1115 +1115 @@
             for dx := -2 to 2 do
               for dy := -2 to 2 do
-                if abs(dx) + abs(dy) = 2 then
+                if Abs(dx) + Abs(dy) = 2 then
                 begin
                   Loc1 := dLoc(MyCity[cixProject].Loc, dx, dy);

trunk/LocalPlayer/Term.pas

@@ -1573 +1573 @@
       if Tribe[I] <> nil then
       begin
-        TestColorDistance := abs(Integer(UnusedTribeFiles.Objects[J])
+        TestColorDistance := Abs(Integer(UnusedTribeFiles.Objects[J])
           shr 16 and $FF - Tribe[I].Color shr 16 and $FF) +
           Abs(Integer(UnusedTribeFiles.Objects[J]) shr 8 and
@@ -1658 +1658 @@
       for I := 0 to nShipPart - 1 do
       begin
-        TestCost := abs(Ship1Change[I]) * Imp[imShipComp + I].Cost;
+        TestCost := Abs(Ship1Change[I]) * Imp[imShipComp + I].Cost;
         if TestCost > MostCost then
         begin
@@ -3534 +3534 @@
           (TButtonC(Components[I]).ButtonIndex <> 1) then
           TButtonC(Components[I]).ButtonIndex :=
-            Integer(MapOptionChecked) shr (Components[I].Tag shr 8) and 1 + 2
+            Integer(MapOptionChecked) shr (Components[I].Tag shr 8) and 1 + 2;
       end;
 
@@ -4585 +4585 @@
     xs := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
     // |xs+xl/2-MapWidth/2| -> min
-    while abs(2 * (xs + G.lx * (xxt * 2)) + xl - MapWidth) <
-      abs(2 * xs + xl - MapWidth) do
+    while Abs(2 * (xs + G.lx * (xxt * 2)) + xl - MapWidth) <
+      Abs(2 * xs + xl - MapWidth) do
         Inc(xs, G.lx * (xxt * 2));
     ys := (y0 - yw) * yyt - yyt;
@@ -4632 +4632 @@
     xMap := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
     // |xMap+xxt-MapWidth/2| -> min
-    while abs(2 * (xMap + G.lx * (xxt * 2)) + 2 * xxt - MapWidth) <
-      abs(2 * xMap + 2 * xxt - MapWidth) do
+    while Abs(2 * (xMap + G.lx * (xxt * 2)) + 2 * xxt - MapWidth) <
+      Abs(2 * xMap + 2 * xxt - MapWidth) do
       Inc(xMap, G.lx * (xxt * 2));
     yMap := (y0 - yw) * yyt - yyt;
@@ -5954 +5954 @@
           mod (2 * G.lx) - G.lx;
         dy := MouseLoc div G.lx - Loc div G.lx;
-        if abs(dx) + abs(dy) < 3 then
+        if Abs(dx) + Abs(dy) < 3 then
         begin
           DestinationMarkON := False;
@@ -6621 +6621 @@
     // ((xFromLoc-xw1)*2+yFromLoc and 1+1)*xxt+dx*xxt/2-MapWidth/2 -> min
     with MainMap do begin
-      while abs(((xFromLoc - xw1 + G.lx) * 2 + yFromLoc and 1 + 1) * xxt * 2 + dx
-        * xxt - MapWidth) < abs(((xFromLoc - xw1) * 2 + yFromLoc and 1 + 1) * xxt
+      while Abs(((xFromLoc - xw1 + G.lx) * 2 + yFromLoc and 1 + 1) * xxt * 2 + dx
+        * xxt - MapWidth) < Abs(((xFromLoc - xw1) * 2 + yFromLoc and 1 + 1) * xxt
         * 2 + dx * xxt - MapWidth) do
         Dec(xw1, G.lx);
@@ -6651 +6651 @@
     NoMap.SetOutput(Buffer);
     NoMap.SetPaintBounds(0, 0, xRange, yRange);
-    for Step := 0 to abs(Step1 - Step0) do
+    for Step := 0 to Abs(Step1 - Step0) do
     begin
       BitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
@@ -6658 +6658 @@
       begin
         xMoving := xFrom +
-          Round((Step0 + Step * (Step1 - Step0) div abs(Step1 - Step0)) *
+          Round((Step0 + Step * (Step1 - Step0) div Abs(Step1 - Step0)) *
           (xTo - xFrom) / nStep);
         yMoving := yFrom +
-          Round((Step0 + Step * (Step1 - Step0) div abs(Step1 - Step0)) *
+          Round((Step0 + Step * (Step1 - Step0) div Abs(Step1 - Step0)) *
           (yTo - yFrom) / nStep);
       end
@@ -6981 +6981 @@
   x0:=(Loc+(y0 and 1+G.lx*1024) div 2) mod G.lx;
   xs:=(x0-xw)*66+y0 and 1*33-G.lx*66;
-  while abs(2*(xs+G.lx*66)-MapWidth)<abs(2*xs-MapWidth) do
+  while Abs(2*(xs+G.lx*66)-MapWidth)<Abs(2*xs-MapWidth) do
   Inc(xs,G.lx*66);
   ys:=(y0-yw)*16;