Changeset 522

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

Files:

• AI/StdAI/AI.pas (modified) (5 diffs)
• AI/StdAI/Barbarina.pas (modified) (8 diffs)
• AI/StdAI/CustomAI.pas (modified) (8 diffs)
• AI/StdAI/CustomAI_Reload.pas (modified) (8 diffs)
• AI/StdAI/ToolAI.pas (modified) (3 diffs)
• AI/StdAI/libstdai-amd64.so (modified) ( previous)
• CityProcessing.pas (modified) (1 diff)
• Database.pas (modified) (5 diffs)
• LocalPlayer/ClientTools.pas (modified) (2 diffs)
• LocalPlayer/Diagram.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (2 diffs)
• LocalPlayer/Nego.pas (modified) (4 diffs)
• LocalPlayer/Select.pas (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (10 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (10 diffs)
• Packages/DpiControls/Dpi.Common.pas (modified) (3 diffs)

trunk/AI/StdAI/AI.pas

@@ -624 +624 @@
         begin
           Inc(I);
-          if random(I) = 0 then
+          if Random(I) = 0 then
             Result := ad;
         end;
@@ -1188 +1188 @@
   begin
     if (Data.LastResearchTech = adHorsebackRiding) and (RO.ResearchTech < 0) and
-      (random(6) = 0) and (HavePort or (ContinentPresence[0] and not
+      (Random(6) = 0) and (HavePort or (ContinentPresence[0] and not
       (1 shl Me or PresenceUnknown) <> 0)) then
     begin
@@ -2109 +2109 @@
                 begin
                   Inc(BestCount);
-                  if random(BestCount) = 0 then
+                  if Random(BestCount) = 0 then
                   begin
                     AttackScore := TestScore;
@@ -2250 +2250 @@
           begin
             Inc(BestCount);
-            if random(BestCount) = 0 then
+            if Random(BestCount) = 0 then
             begin
               PatrolScore := TestScore;
@@ -2406 +2406 @@
       begin
         Inc(Count);
-        if random(Count) = 0 then
+        if Random(Count) = 0 then
           Result := mix;
       end;

trunk/AI/StdAI/Barbarina.pas

@@ -762 +762 @@
           begin
             Inc(BestCount);
-            if random(BestCount) = 0 then
+            if Random(BestCount) = 0 then
             begin
               PatrolScore := TestScore;
@@ -888 +888 @@
   var
     I, F, uix, Loc1, A, B: Integer;
-    ready, go: Boolean;
+    Ready, Go: Boolean;
     TransportPlan: TGroupTransportPlan;
   begin
-    go := False;
+    Go := False;
     for F := 0 to maxCOD - 1 do
       if (F < nContinent) and (ContinentPresence[F] and not
         (1 shl Me or PresenceUnknown) <> 0) then
-        go := True; // any enemy island known?
-    if not go then
+        Go := True; // any enemy island known?
+    if not Go then
       Exit;
 
     SeaTransport_BeginInitialize;
-    go := False;
+    Go := False;
     for uix := 0 to RO.nUn - 1 do
       if not Moved[uix] then
@@ -915 +915 @@
             end;
           end;
-    if go then
+    if Go then
     begin
-      go := False;
+      Go := False;
       for uix := 0 to RO.nUn - 1 do
         if not Moved[uix] then
@@ -928 +928 @@
             end;
     end;
-    if go then
+    if Go then
       for Loc1 := 0 to MapSize - 1 do
         if Map[Loc1] and fTerrain >= fGrass then
@@ -941 +941 @@
     begin
       Moved[TransportPlan.uixTransport] := True;
-      ready := MyUnit[TransportPlan.uixTransport].Loc = TransportPlan.LoadLoc;
-      if not ready then
+      Ready := MyUnit[TransportPlan.uixTransport].Loc = TransportPlan.LoadLoc;
+      if not Ready then
       begin
         Unit_MoveEx(TransportPlan.uixTransport, TransportPlan.LoadLoc);
-        ready := MyUnit[TransportPlan.uixTransport].Loc = TransportPlan.LoadLoc;
-      end;
-      if ready then
+        Ready := MyUnit[TransportPlan.uixTransport].Loc = TransportPlan.LoadLoc;
+      end;
+      if Ready then
         for I := 0 to TransportPlan.nLoad - 1 do
         begin
           Loc_to_ab(TransportPlan.LoadLoc,
             MyUnit[TransportPlan.uixLoad[I]].Loc, A, B);
-          ready := ready and (abs(A) <= 1) and (abs(B) <= 1);
-        end;
-      if ready then
+          Ready := Ready and (Abs(A) <= 1) and (Abs(B) <= 1);
+        end;
+      if Ready then
       begin
         for I := 0 to TransportPlan.nLoad - 1 do
@@ -1646 +1646 @@
       begin
         Inc(nPreq);
-        if random(nPreq) = 0 then
+        if Random(nPreq) = 0 then
           ChosenPreq := ad;
       end;
@@ -1736 +1736 @@
   I := 0;
   while (I < nResearchOrder) and (not NeedSeaUnits and (ResearchOrder[I] < 0) or
-      IsResearched(abs(ResearchOrder[I]))) do
+      IsResearched(Abs(ResearchOrder[I]))) do
     Inc(I);
   if I >= nResearchOrder then // list done, continue with future tech
   begin
-    if random(2) = 1 then
+    if Random(2) = 1 then
       Result := futArtificialIntelligence
     else
@@ -1750 +1750 @@
     nPreq := 0;
     ChosenPreq := -1;
-    ChoosePreq(abs(ResearchOrder[I]));
+    ChoosePreq(Abs(ResearchOrder[I]));
     Assert(nPreq > 0);
     Result := ChosenPreq;

trunk/AI/StdAI/CustomAI.pas

@@ -246 +246 @@
 procedure ab_to_V8(A, B: Integer; var V8: Integer);
 begin
-  Assert((abs(A) <= 1) and (abs(B) <= 1) and ((A <> 0) or (B <> 0)));
+  Assert((Abs(A) <= 1) and (Abs(B) <= 1) and ((A <> 0) or (B <> 0)));
   V8 := ab_v8[2 * B + B + A];
 end;
@@ -373 +373 @@
 begin
   Loc_to_ab(Loc0, Loc1, A, B);
-  dx := abs(A - B);
-  dy := abs(A + B);
-  Result := dx + dy + abs(dx - dy) shr 1;
-end;
-
+  dx := Abs(A - B);
+  dy := Abs(A + B);
+  Result := dx + dy + Abs(dx - dy) shr 1;
+end;
 
 procedure Init(NewGameData: TNewGameData);
@@ -392 +391 @@
 {$ENDIF}
 end;
-
 
 constructor TCustomAI.Create(Nation: Integer);
@@ -410 +408 @@
   Server(sSetDebugMap, Me, 0, nodata^);
 end;
-
 
 procedure TCustomAI.Process(Command: Integer; var Data);
@@ -495 +492 @@
             begin
               Inc(Count);
-              if random(Count) = 0 then
+              if Random(Count) = 0 then
                 NewResearch := ad;
             end;
@@ -623 +620 @@
       begin
         Inc(Count);
-        if random(Count) = 0 then
+        if Random(Count) = 0 then
           Steal := ad;
       end;
@@ -1109 +1106 @@
 end;
 
-
 // negotiation
 function TCustomAI.Nego_CheckMyAction: Integer;
@@ -1122 +1118 @@
 end;
 
-
 initialization
   nodata := Pointer(0);

trunk/AI/StdAI/CustomAI_Reload.pas

@@ -5 +5 @@
 
 uses
-{$IFDEF DEBUG}SysUtils,{$ENDIF} // necessary for debug exceptions
+{$IFDEF DEBUG}SysUtils,{$ENDIF}// necessary for debug exceptions
   Protocol;
 
 type
-TNegoTime=(BeginOfTurn, EndOfTurn, EnemyCalled);
-
-TCustomAI=class
-public
-  procedure Process(Command: Integer; var Data);
-
-  // overridables
-  constructor Create(Nation: Integer); virtual;
-  destructor Destroy; override;
-  procedure SetDataDefaults; virtual;
-  procedure SetDataRandom; virtual;
-  procedure OnBeforeEnemyAttack(UnitInfo: TUnitInfo;
-    ToLoc, EndHealth, EndHealthDef: Integer); virtual;
-  procedure OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: Integer); virtual;
-  procedure OnAfterEnemyAttack; virtual;
-  procedure OnAfterEnemyCapture; virtual;
-
-protected
-  Me: Integer; // index of the controlled nation
-  RO: ^TPlayerContext;
-  Map: ^TTileList;
-  MyUnit: ^TUnList;
-  MyCity: ^TCityList;
-  MyModel: ^TModelList;
-
-  cixStateImp: array[imPalace..imSpacePort] of Integer;
-
-  // negotiation
-  Opponent: Integer; // nation i'm in negotiation with, -1 indicates no-negotiation mode
-  MyAction, MyLastAction, OppoAction: Integer;
-  MyOffer, MyLastOffer, OppoOffer: TOffer;
-
-  // overridables
-  procedure DoTurn; virtual;
-  procedure DoNegotiation; virtual;
-  function ChooseResearchAdvance: Integer; virtual;
-  function ChooseStealAdvance: Integer; virtual;
-  function ChooseGovernment: Integer; virtual;
-  function WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean; virtual;
-  function OnNegoRejected_CancelTreaty: Boolean; virtual;
-
-  // general functions
-  function IsResearched(Advance: Integer): Boolean;
-  function ResearchCost: Integer;
-  function ChangeAttitude(Nation, Attitude: Integer): Integer;
-  function Revolution: Integer;
-  function ChangeRates(Tax,Lux: Integer): Integer;
-  function PrepareNewModel(Domain: Integer): Integer;
-  function SetNewModelFeature(F, Count: Integer): Integer;
-  function AdvanceResearchable(Advance: Integer): Boolean;
-  function AdvanceStealable(Advance: Integer): Boolean;
-  function DebugMessage(Level: Integer; Text: string): Boolean;
-  function SetDebugMap(var DebugMap): Boolean;
-
-  // unit functions
-  procedure Unit_FindMyDefender(Loc: Integer; var uix: Integer);
-  procedure Unit_FindEnemyDefender(Loc: Integer; var euix: Integer);
-  function Unit_Move(uix,ToLoc: Integer): Integer;
-  function Unit_Step(uix,ToLoc: Integer): Integer;
-  function Unit_Attack(uix,ToLoc: Integer): Integer;
-  function Unit_DoMission(uix,MissionType,ToLoc: Integer): Integer;
-  function Unit_MoveForecast(uix,ToLoc: Integer; var RemainingMovement: Integer): Boolean;
-  function Unit_AttackForecast(uix,ToLoc,AttackMovement: Integer; var RemainingHealth: Integer): Boolean;
-  function Unit_DefenseForecast(euix,ToLoc: Integer; var RemainingHealth: Integer): Boolean;
-  function Unit_Disband(uix: Integer): Integer;
-  function Unit_StartJob(uix,NewJob: Integer): Integer;
-  function Unit_SetHomeHere(uix: Integer): Integer;
-  function Unit_Load(uix: Integer): Integer;
-  function Unit_Unload(uix: Integer): Integer;
-  function Unit_AddToCity(uix: Integer): Integer;
-
-  // city functions
-  procedure City_FindMyCity(Loc: Integer; var cix: Integer);
-  procedure City_FindEnemyCity(Loc: Integer; var ecix: Integer);
-  function City_HasProject(cix: Integer): Boolean;
-  function City_CurrentImprovementProject(cix: Integer): Integer;
-  function City_CurrentUnitProject(cix: Integer): Integer;
-  function City_GetTileInfo(cix,TileLoc: Integer; var TileInfo: TTileInfo): Integer;
-  function City_GetReport(cix: Integer; var Report: TCityReport): Integer;
-  function City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: Integer; var Report: TCityReport): Integer;
-  function City_GetAreaInfo(cix: Integer; var AreaInfo: TCityAreaInfo): Integer;
-  function City_StartUnitProduction(cix,mix: Integer): Integer;
-  function City_StartEmigration(cix,mix: Integer; AllowDisbandCity, AsConscripts: Boolean): Integer;
-  function City_StartImprovement(cix,iix: Integer): Integer;
-  function City_Improvable(cix,iix: Integer): Boolean;
-  function City_StopProduction(cix: Integer): Integer;
-  function City_BuyProject(cix: Integer): Integer;
-  function City_SellImprovement(cix,iix: Integer): Integer;
-  function City_RebuildImprovement(cix,iix: Integer): Integer;
-  function City_SetTiles(cix,NewTiles: Integer): Integer;
-
-  // negotiation
-  function Nego_CheckMyAction: Integer;
-
-private
-  HaveTurned: Boolean;
-  UnwantedNego: set of 0..nPl-1;
-  Contacted: set of 0..nPl-1;
-  procedure StealAdvance;
-  end;
-
-
-var
-Server: TServerCall;
-G: TNewGameData;
-RWDataSize, MapSize: Integer;
-decompose24: Cardinal;
-nodata: Pointer;
+  TNegoTime = (BeginOfTurn, EndOfTurn, EnemyCalled);
+
+  TCustomAI = class
+  public
+    procedure Process(Command: Integer; var Data);
+
+    // overridables
+    constructor Create(Nation: Integer); virtual;
+    destructor Destroy; override;
+    procedure SetDataDefaults; virtual;
+    procedure SetDataRandom; virtual;
+    procedure OnBeforeEnemyAttack(UnitInfo: TUnitInfo;
+      ToLoc, EndHealth, EndHealthDef: Integer); virtual;
+    procedure OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: Integer); virtual;
+    procedure OnAfterEnemyAttack; virtual;
+    procedure OnAfterEnemyCapture; virtual;
+  protected
+    Me: Integer; // index of the controlled nation
+    RO: ^TPlayerContext;
+    Map: ^TTileList;
+    MyUnit: ^TUnList;
+    MyCity: ^TCityList;
+    MyModel: ^TModelList;
+
+    cixStateImp: array[imPalace..imSpacePort] of Integer;
+
+    // negotiation
+    Opponent: Integer; // nation i'm in negotiation with, -1 indicates no-negotiation mode
+    MyAction, MyLastAction, OppoAction: Integer;
+    MyOffer, MyLastOffer, OppoOffer: TOffer;
+
+    // overridables
+    procedure DoTurn; virtual;
+    procedure DoNegotiation; virtual;
+    function ChooseResearchAdvance: Integer; virtual;
+    function ChooseStealAdvance: Integer; virtual;
+    function ChooseGovernment: Integer; virtual;
+    function WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean; virtual;
+    function OnNegoRejected_CancelTreaty: Boolean; virtual;
+
+    // general functions
+    function IsResearched(Advance: Integer): Boolean;
+    function ResearchCost: Integer;
+    function ChangeAttitude(Nation, Attitude: Integer): Integer;
+    function Revolution: Integer;
+    function ChangeRates(Tax, Lux: Integer): Integer;
+    function PrepareNewModel(Domain: Integer): Integer;
+    function SetNewModelFeature(F, Count: Integer): Integer;
+    function AdvanceResearchable(Advance: Integer): Boolean;
+    function AdvanceStealable(Advance: Integer): Boolean;
+    function DebugMessage(Level: Integer; Text: string): Boolean;
+    function SetDebugMap(var DebugMap): Boolean;
+
+    // unit functions
+    procedure Unit_FindMyDefender(Loc: Integer; var uix: Integer);
+    procedure Unit_FindEnemyDefender(Loc: Integer; var euix: Integer);
+    function Unit_Move(uix, ToLoc: Integer): Integer;
+    function Unit_Step(uix, ToLoc: Integer): Integer;
+    function Unit_Attack(uix, ToLoc: Integer): Integer;
+    function Unit_DoMission(uix, MissionType, ToLoc: Integer): Integer;
+    function Unit_MoveForecast(uix, ToLoc: Integer;
+      var RemainingMovement: Integer): Boolean;
+    function Unit_AttackForecast(uix, ToLoc, AttackMovement: Integer;
+      var RemainingHealth: Integer): Boolean;
+    function Unit_DefenseForecast(euix, ToLoc: Integer;
+      var RemainingHealth: Integer): Boolean;
+    function Unit_Disband(uix: Integer): Integer;
+    function Unit_StartJob(uix, NewJob: Integer): Integer;
+    function Unit_SetHomeHere(uix: Integer): Integer;
+    function Unit_Load(uix: Integer): Integer;
+    function Unit_Unload(uix: Integer): Integer;
+    function Unit_AddToCity(uix: Integer): Integer;
+
+    // city functions
+    procedure City_FindMyCity(Loc: Integer; var cix: Integer);
+    procedure City_FindEnemyCity(Loc: Integer; var ecix: Integer);
+    function City_HasProject(cix: Integer): Boolean;
+    function City_CurrentImprovementProject(cix: Integer): Integer;
+    function City_CurrentUnitProject(cix: Integer): Integer;
+    function City_GetTileInfo(cix, TileLoc: Integer; var TileInfo: TTileInfo): Integer;
+    function City_GetReport(cix: Integer; var Report: TCityReport): Integer;
+    function City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: Integer;
+      var Report: TCityReport): Integer;
+    function City_GetAreaInfo(cix: Integer; var AreaInfo: TCityAreaInfo): Integer;
+    function City_StartUnitProduction(cix, mix: Integer): Integer;
+    function City_StartEmigration(cix, mix: Integer;
+      AllowDisbandCity, AsConscripts: Boolean): Integer;
+    function City_StartImprovement(cix, iix: Integer): Integer;
+    function City_Improvable(cix, iix: Integer): Boolean;
+    function City_StopProduction(cix: Integer): Integer;
+    function City_BuyProject(cix: Integer): Integer;
+    function City_SellImprovement(cix, iix: Integer): Integer;
+    function City_RebuildImprovement(cix, iix: Integer): Integer;
+    function City_SetTiles(cix, NewTiles: Integer): Integer;
+
+    // negotiation
+    function Nego_CheckMyAction: Integer;
+  private
+    HaveTurned: Boolean;
+    UnwantedNego: set of 0..nPl - 1;
+    Contacted: set of 0..nPl - 1;
+    procedure StealAdvance;
+  end;
+
+var
+  Server: TServerCall;
+  G: TNewGameData;
+  RWDataSize, MapSize: Integer;
+  decompose24: cardinal;
+  nodata: Pointer;
 
 const
-CityOwnTile = 13; // = ab_to_V21(0,0)
-
-// additional return codes
-rLocationReached=       $00010000; // Unit_Move: move was not interrupted, location reached
-rMoreTurns=             $00020000; // Unit_Move: move was not interrupted, location not reached yet
+  CityOwnTile = 13; // = ab_to_V21(0,0)
+
+  // additional return codes
+  rLocationReached = $00010000;
+  // Unit_Move: move was not interrupted, location reached
+  rMoreTurns = $00020000;
+// Unit_Move: move was not interrupted, location not reached yet
 
 type
-TVicinity8Loc=array[0..7] of Integer;
-TVicinity21Loc=array[0..27] of Integer;
-
+  TVicinity8Loc = array[0..7] of Integer;
+  TVicinity21Loc = array[0..27] of Integer;
 
 procedure Init(NewGameData: TNewGameData);
 
-procedure ab_to_Loc(Loc0,A,B: Integer; var Loc: Integer);
-procedure Loc_to_ab(Loc0,Loc: Integer; var A,B: Integer);
-procedure ab_to_V8(A,B: Integer; var V8: Integer);
-procedure V8_to_ab(V8: Integer; var A,B: Integer);
-procedure ab_to_V21(A,B: Integer; var V21: Integer);
-procedure V21_to_ab(V21: Integer; var A,B: Integer);
+procedure ab_to_Loc(Loc0, A, B: Integer; var Loc: Integer);
+procedure Loc_to_ab(Loc0, Loc: Integer; var A, B: Integer);
+procedure ab_to_V8(A, B: Integer; var V8: Integer);
+procedure V8_to_ab(V8: Integer; var A, B: Integer);
+procedure ab_to_V21(A, B: Integer; var V21: Integer);
+procedure V21_to_ab(V21: Integer; var A, B: Integer);
 procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
 procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
@@ -145 +148 @@
 
 const
-ab_v8: array[-4..4] of Integer = (5,6,7,4,-1,0,3,2,1);
-v8_a: array[0..7] of Integer = (1,1,0,-1,-1,-1,0,1);
-v8_b: array[0..7] of Integer = (0,1,1,1,0,-1,-1,-1);
-
-
-procedure ab_to_Loc(Loc0,A,B: Integer; var Loc: Integer);
+  ab_v8: array[-4..4] of Integer = (5, 6, 7, 4, -1, 0, 3, 2, 1);
+  v8_a: array[0..7] of Integer = (1, 1, 0, -1, -1, -1, 0, 1);
+  v8_b: array[0..7] of Integer = (0, 1, 1, 1, 0, -1, -1, -1);
+
+procedure ab_to_Loc(Loc0, A, B: Integer; var Loc: Integer);
 {relative location from Loc0}
 var
-y0: Integer;
-begin
-Assert((Loc0>=0) and (Loc0<MapSize) and (A-B+G.lx>=0));
-y0:=Cardinal(Loc0)*decompose24 shr 24;
-Loc:=(Loc0+(A-B+y0 and 1+G.lx+G.lx) shr 1) mod G.lx +G.lx*(y0+A+B);
-if Loc>=MapSize then Loc:=-$1000
-end;
-
-procedure Loc_to_ab(Loc0,Loc: Integer; var A,B: Integer);
+  y0: Integer;
+begin
+  Assert((Loc0 >= 0) and (Loc0 < MapSize) and (A - B + G.lx >= 0));
+  y0 := cardinal(Loc0) * decompose24 shr 24;
+  Loc := (Loc0 + (A - B + y0 and 1 + G.lx + G.lx) shr 1) mod G.lx + G.lx * (y0 + A + B);
+  if Loc >= MapSize then Loc := -$1000;
+end;
+
+procedure Loc_to_ab(Loc0, Loc: Integer; var A, B: Integer);
 {$IFDEF FPC} // freepascal
 var
-dx,dy: Integer;
-begin
-dx:=((Loc mod G.lx *2 +Loc 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:=Loc div G.lx-Loc0 div G.lx;
-A:=(dx+dy) div 2;
-B:=(dy-dx) div 2;
-end;
-{$ELSE} // delphi
-register;
+  dx, dy: Integer;
+begin
+  dx := ((Loc mod G.lx * 2 + Loc 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 := Loc div G.lx - Loc0 div G.lx;
+  A := (dx + dy) div 2;
+  B := (dy - dx) div 2;
+end;
+{$ELSE}// delphi
+  register;
 asm
-push ebx
-
-// calculate
-push ecx
-div Byte ptr [G]
-xor ebx,ebx
-mov bl,ah  // ebx:=Loc0 mod G.lx
-mov ecx,eax
-and ecx,$000000FF // ecx:=Loc0 div G.lx
-mov eax,edx
-div Byte ptr [G]
-xor edx,edx
-mov dl,ah // edx:=Loc mod G.lx
-and eax,$000000FF // eax:=Loc div G.lx
-sub edx,ebx // edx:=Loc mod G.lx-Loc0 mod G.lx
-mov ebx,eax
-sub ebx,ecx // ebx:=dy
-and eax,1
-and ecx,1
-add edx,edx
-add eax,edx
-sub eax,ecx // eax:=dx, not normalized
-pop ecx
-
-// normalize
-mov edx,dword ptr [G]
-cmp eax,edx
-jl @A
-  sub eax,edx
-  sub eax,edx
-  jmp @ok
-@A:
-neg edx
-cmp eax,edx
-jnl @ok
-  sub eax,edx
-  sub eax,edx
-
-// return results
-@ok:
-mov edx,ebx
-sub edx,eax
-add eax,ebx
-sar edx,1 // edx:=b
-mov ebx,[B]
-mov [ebx],edx
-sar eax,1 // eax:=a
-mov [A],eax
-
-pop ebx
+         PUSH    EBX
+
+         // calculate
+         PUSH    ECX
+         DIV     Byte ptr [G]
+         XOR     EBX,EBX
+         MOV     BL,AH  // ebx:=Loc0 mod G.lx
+         MOV     ECX,EAX
+         AND     ECX,$000000FF // ecx:=Loc0 div G.lx
+         MOV     EAX,EDX
+         DIV     Byte ptr [G]
+         XOR     EDX,EDX
+         MOV     DL,AH // edx:=Loc mod G.lx
+         AND     EAX,$000000FF // eax:=Loc div G.lx
+         SUB     EDX,EBX // edx:=Loc mod G.lx-Loc0 mod G.lx
+         MOV     EBX,EAX
+         SUB     EBX,ECX // ebx:=dy
+         AND     EAX,1
+         AND     ECX,1
+         ADD     EDX,EDX
+         ADD     EAX,EDX
+         SUB     EAX,ECX // eax:=dx, not normalized
+         POP     ECX
+
+         // normalize
+         MOV     EDX,dword ptr [G]
+         CMP     EAX,EDX
+         JL      @A
+         SUB     EAX,EDX
+         SUB     EAX,EDX
+         JMP     @ok
+         @A:
+         NEG     EDX
+         CMP     EAX,EDX
+         JNL     @ok
+         SUB     EAX,EDX
+         SUB     EAX,EDX
+
+         // return results
+         @ok:
+         MOV     EDX,EBX
+         SUB     EDX,EAX
+         ADD     EAX,EBX
+         SAR     EDX,1 // edx:=b
+         MOV     EBX,[B]
+         MOV     [EBX],EDX
+         SAR     EAX,1 // eax:=a
+         MOV     [A],EAX
+
+         POP     EBX
 end;
 {$ENDIF}
 
-procedure ab_to_V8(A,B: Integer; var V8: Integer);
-begin
-Assert((abs(A)<=1) and (abs(B)<=1) and ((A<>0) or (B<>0)));
-V8:=ab_v8[2*B+B+A];
-end;
-
-procedure V8_to_ab(V8: Integer; var A,B: Integer);
-begin
-A:=v8_a[V8]; B:=V8_b[V8];
-end;
-
-procedure ab_to_V21(A,B: Integer; var V21: Integer);
-begin
-V21:=(A+B+3) shl 2+(A-B+3) shr 1;
-end;
-
-procedure V21_to_ab(V21: Integer; var A,B: Integer);
-var
-dx,dy: Integer;
-begin
-dy:=V21 shr 2-3;
-dx:=V21 and 3 shl 1 -3 + (dy+3) and 1;
-A:=(dx+dy) div 2;
-B:=(dy-dx) div 2;
+procedure ab_to_V8(A, B: Integer; var V8: Integer);
+begin
+  Assert((Abs(A) <= 1) and (Abs(B) <= 1) and ((A <> 0) or (B <> 0)));
+  V8 := ab_v8[2 * B + B + A];
+end;
+
+procedure V8_to_ab(V8: Integer; var A, B: Integer);
+begin
+  A := v8_a[V8];
+  B := V8_b[V8];
+end;
+
+procedure ab_to_V21(A, B: Integer; var V21: Integer);
+begin
+  V21 := (A + B + 3) shl 2 + (A - B + 3) shr 1;
+end;
+
+procedure V21_to_ab(V21: Integer; var A, B: Integer);
+var
+  dx, dy: Integer;
+begin
+  dy := V21 shr 2 - 3;
+  dx := V21 and 3 shl 1 - 3 + (dy + 3) and 1;
+  A := (dx + dy) div 2;
+  B := (dy - dx) div 2;
 end;
 
 procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
 var
-x0,y0,lx: Integer;
-begin
-lx:=G.lx;
-y0:=Cardinal(Loc0)*decompose24 shr 24;
-x0:=Loc0-y0*lx; // Loc0 mod lx;
-VicinityLoc[1]:=Loc0+lx*2;
-VicinityLoc[3]:=Loc0-1;
-VicinityLoc[5]:=Loc0-lx*2;
-VicinityLoc[7]:=Loc0+1;
-Inc(Loc0,y0 and 1);
-VicinityLoc[0]:=Loc0+lx;
-VicinityLoc[2]:=Loc0+lx-1;
-VicinityLoc[4]:=Loc0-lx-1;
-VicinityLoc[6]:=Loc0-lx;
-
-// world is round!
-if x0<lx-1 then
+  x0, y0, lx: Integer;
+begin
+  lx := G.lx;
+  y0 := cardinal(Loc0) * decompose24 shr 24;
+  x0 := Loc0 - y0 * lx; // Loc0 mod lx;
+  VicinityLoc[1] := Loc0 + lx * 2;
+  VicinityLoc[3] := Loc0 - 1;
+  VicinityLoc[5] := Loc0 - lx * 2;
+  VicinityLoc[7] := Loc0 + 1;
+  Inc(Loc0, y0 and 1);
+  VicinityLoc[0] := Loc0 + lx;
+  VicinityLoc[2] := Loc0 + lx - 1;
+  VicinityLoc[4] := Loc0 - lx - 1;
+  VicinityLoc[6] := Loc0 - lx;
+
+  // world is round!
+  if x0 < lx - 1 then
   begin
-  if x0=0 then
+    if x0 = 0 then
     begin
-    Inc(VicinityLoc[3],lx);
-    if y0 and 1=0 then
-      begin
-      Inc(VicinityLoc[2],lx);
-      Inc(VicinityLoc[4],lx);
-      end
+      Inc(VicinityLoc[3], lx);
+      if y0 and 1 = 0 then
+      begin
+        Inc(VicinityLoc[2], lx);
+        Inc(VicinityLoc[4], lx);
+      end;
+    end;
+  end
+  else
+  begin
+    Dec(VicinityLoc[7], lx);
+    if y0 and 1 = 1 then
+    begin
+      Dec(VicinityLoc[0], lx);
+      Dec(VicinityLoc[6], lx);
+    end;
+  end;
+
+  // check south pole
+  case G.ly - y0 of
+    1:
+    begin
+      VicinityLoc[0] := -$1000;
+      VicinityLoc[1] := -$1000;
+      VicinityLoc[2] := -$1000;
+    end;
+    2: VicinityLoc[1] := -$1000;
+  end;
+end;
+
+procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
+var
+  dx, dy, bit, y0, xComp, yComp, xComp0, xCompSwitch: Integer;
+  dst: ^Integer;
+begin
+  y0 := cardinal(Loc0) * decompose24 shr 24;
+  xComp0 := Loc0 - y0 * G.lx - 1; // Loc0 mod G.lx -1
+  xCompSwitch := xComp0 - 1 + y0 and 1;
+  if xComp0 < 0 then Inc(xComp0, G.lx);
+  if xCompSwitch < 0 then Inc(xCompSwitch, G.lx);
+  xCompSwitch := xCompSwitch xor xComp0;
+  yComp := G.lx * (y0 - 3);
+  dst := @VicinityLoc;
+  bit := 1;
+  for dy := 0 to 6 do
+    if yComp < MapSize then
+    begin
+      xComp0 := xComp0 xor xCompSwitch;
+      xComp := xComp0;
+      for dx := 0 to 3 do
+      begin
+        if bit and $67F7F76 <> 0 then dst^ := xComp + yComp
+        else
+          dst^ := -1;
+        Inc(xComp);
+        if xComp >= G.lx then Dec(xComp, G.lx);
+        Inc(dst);
+        bit := bit shl 1;
+      end;
+      Inc(yComp, G.lx);
     end
-  end
-else
-  begin
-  Dec(VicinityLoc[7],lx);
-  if y0 and 1=1 then
+    else
     begin
-    Dec(VicinityLoc[0],lx);
-    Dec(VicinityLoc[6],lx);
-    end
-  end;
-
-// check south pole
-case G.ly-y0 of
-  1:
-    begin
-    VicinityLoc[0]:=-$1000;
-    VicinityLoc[1]:=-$1000;
-    VicinityLoc[2]:=-$1000;
+      for dx := 0 to 3 do
+      begin
+        dst^ := -$1000;
+        Inc(dst);
+      end;
     end;
-  2: VicinityLoc[1]:=-$1000;
-  end
-end;
-
-procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
-var
-dx,dy,bit,y0,xComp,yComp,xComp0,xCompSwitch: Integer;
-dst: ^Integer;
-begin
-y0:=Cardinal(Loc0)*decompose24 shr 24;
-xComp0:=Loc0-y0*G.lx-1; // Loc0 mod G.lx -1
-xCompSwitch:=xComp0-1+y0 and 1;
-if xComp0<0 then Inc(xComp0,G.lx);
-if xCompSwitch<0 then Inc(xCompSwitch,G.lx);
-xCompSwitch:=xCompSwitch xor xComp0;
-yComp:=G.lx*(y0-3);
-dst:=@VicinityLoc;
-bit:=1;
-for dy:=0 to 6 do
-  if yComp<MapSize then
-    begin
-    xComp0:=xComp0 xor xCompSwitch;
-    xComp:=xComp0;
-    for dx:=0 to 3 do
-      begin
-      if bit and $67F7F76<>0 then dst^:=xComp+yComp
-      else dst^:=-1;
-      Inc(xComp);
-      if xComp>=G.lx then Dec(xComp, G.lx);
-      Inc(dst);
-      bit:=bit shl 1;
-      end;
-    Inc(yComp,G.lx);
-    end
-  else
-    begin
-    for dx:=0 to 3 do
-      begin dst^:=-$1000; Inc(dst); end;
-    end
-end;
-
+end;
 
 procedure Init(NewGameData: TNewGameData);
 {$IFDEF DEBUG}var Loc: Integer;{$ENDIF}
 begin
-G:=NewGameData;
-MapSize:=G.lx*G.ly;
-decompose24:=(1 shl 24-1) div G.lx +1;
+  G := NewGameData;
+  MapSize := G.lx * G.ly;
+  decompose24 := (1 shl 24 - 1) div G.lx + 1;
 {$IFDEF DEBUG}for Loc:=0 to MapSize-1 do Assert(Cardinal(Loc)*decompose24 shr 24=Cardinal(Loc div G.lx));{$ENDIF}
 end;
 
-
 constructor TCustomAI.Create(Nation: Integer);
 begin
-inherited Create;
-Me:=Nation;
-RO:=Pointer(G.RO[Nation]);
-Map:=Pointer(RO.Map);
-MyUnit:=Pointer(RO.Un);
-MyCity:=Pointer(RO.City);
-MyModel:=Pointer(RO.Model);
-Opponent:=-1;
+  inherited Create;
+  Me := Nation;
+  RO := Pointer(G.RO[Nation]);
+  Map := Pointer(RO.Map);
+  MyUnit := Pointer(RO.Un);
+  MyCity := Pointer(RO.City);
+  MyModel := Pointer(RO.Model);
+  Opponent := -1;
 end;
 
 destructor TCustomAI.Destroy;
 begin
-Server(sSetDebugMap,Me,0,nodata^);
-end;
-
+  Server(sSetDebugMap, Me, 0, nodata^);
+end;
 
 procedure TCustomAI.Process(Command: Integer; var Data);
 var
-Nation,NewResearch,NewGov,count,ad,cix,iix: Integer;
-NegoTime: TNegoTime;
-begin
-case Command of
-  cTurn, cContinue:
+  Nation, NewResearch, NewGov, Count, ad, cix, iix: Integer;
+  NegoTime: TNegoTime;
+begin
+  case Command of
+    cTurn, cContinue:
     begin
-    if RO.Alive and (1 shl Me)=0 then
+      if RO.Alive and (1 shl Me) = 0 then
       begin // I'm dead, huhu
-      Server(sTurn,Me,0,nodata^);
-      Exit
+        Server(sTurn, Me, 0, nodata^);
+        Exit;
       end;
-    if Command=cTurn then
-      begin
-      FillChar(cixStateImp, SizeOf(cixStateImp), $FF);
-      for cix:=0 to RO.nCity-1 do if MyCity[cix].Loc>=0 then
-        for iix:=imPalace to imSpacePort do
-          if MyCity[cix].Built[iix]>0 then
-            cixStateImp[iix]:=cix;
-      if RO.Happened and phChangeGov<>0 then
+      if Command = cTurn then
+      begin
+        FillChar(cixStateImp, SizeOf(cixStateImp), $FF);
+        for cix := 0 to RO.nCity - 1 do if MyCity[cix].Loc >= 0 then
+            for iix := imPalace to imSpacePort do
+              if MyCity[cix].Built[iix] > 0 then
+                cixStateImp[iix] := cix;
+        if RO.Happened and phChangeGov <> 0 then
         begin
-        NewGov:=ChooseGovernment;
-        if NewGov>gAnarchy then
-          Server(sSetGovernment,Me,NewGov,nodata^);
+          NewGov := ChooseGovernment;
+          if NewGov > gAnarchy then
+            Server(sSetGovernment, Me, NewGov, nodata^);
         end;
-      HaveTurned:=False;
-      Contacted:=[];
+        HaveTurned := False;
+        Contacted := [];
       end;
-    if (Command=cContinue) and (MyAction=scContact) then
-      begin
-      if OnNegoRejected_CancelTreaty then
-        if RO.Treaty[Opponent]>=trPeace then
-          if Server(sCancelTreaty,Me,0,nodata^)<rExecuted then
-            Assert(False)
+      if (Command = cContinue) and (MyAction = scContact) then
+      begin
+        if OnNegoRejected_CancelTreaty then
+          if RO.Treaty[Opponent] >= trPeace then
+            if Server(sCancelTreaty, Me, 0, nodata^) < rExecuted then
+              Assert(False);
       end
-    else UnwantedNego:=[];
-    Opponent:=-1;
-    repeat
-      if HaveTurned then NegoTime:=EndOfTurn
-      else NegoTime:=BeginOfTurn;
-      if RO.Government<>gAnarchy then
-        for Nation:=0 to nPl-1 do
-           if (Nation<>Me) and (1 shl Nation and RO.Alive<>0)
-             and (RO.Treaty[Nation]>=trNone)
-             and not (Nation in Contacted) and not (Nation in UnwantedNego)
-             and (Server(scContact-sExecute + Nation shl 4, Me, 0, nodata^)>=rExecuted) then
-             if WantNegotiation(Nation, NegoTime) then
-               begin
-               if Server(scContact + Nation shl 4, Me, 0, nodata^)>=rExecuted then
-                 begin
-                 Include(Contacted, Nation);
-                 Opponent:=Nation;
-                 MyAction:=scContact;
-                 Exit;
-                 end;
-               end
-             else Include(UnwantedNego,Nation);
-      if NegoTime=BeginOfTurn then
+      else
+        UnwantedNego := [];
+      Opponent := -1;
+      repeat
+        if HaveTurned then NegoTime := EndOfTurn
+        else
+          NegoTime := BeginOfTurn;
+        if RO.Government <> gAnarchy then
+          for Nation := 0 to nPl - 1 do
+            if (Nation <> Me) and (1 shl Nation and RO.Alive <> 0) and
+              (RO.Treaty[Nation] >= trNone) and not (Nation in Contacted) and not
+              (Nation in UnwantedNego) and
+              (Server(scContact - sExecute + Nation shl 4, Me, 0, nodata^) >= rExecuted) then
+              if WantNegotiation(Nation, NegoTime) then
+              begin
+                if Server(scContact + Nation shl 4, Me, 0, nodata^) >= rExecuted then
+                begin
+                  Include(Contacted, Nation);
+                  Opponent := Nation;
+                  MyAction := scContact;
+                  Exit;
+                end;
+              end
+              else
+                Include(UnwantedNego, Nation);
+        if NegoTime = BeginOfTurn then
         begin
-        DoTurn;
-        HaveTurned:=True;
-        Contacted:=[];
-        UnwantedNego:=[];
+          DoTurn;
+          HaveTurned := True;
+          Contacted := [];
+          UnwantedNego := [];
         end
-      else Break;
-    until False;
-    if RO.Happened and phTech<>0 then
-      begin
-      NewResearch:=ChooseResearchAdvance;
-      if NewResearch<0 then
+        else
+          Break;
+      until False;
+      if RO.Happened and phTech <> 0 then
+      begin
+        NewResearch := ChooseResearchAdvance;
+        if NewResearch < 0 then
         begin // choose random research
-        count:=0;
-        for ad:=0 to nAdv-1 do if AdvanceResearchable(ad) then
-          begin Inc(count); if random(count)=0 then NewResearch:=ad end
+          Count := 0;
+          for ad := 0 to nAdv - 1 do if AdvanceResearchable(ad) then
+            begin
+              Inc(Count);
+              if Random(Count) = 0 then NewResearch := ad;
+            end;
         end;
-      Server(sSetResearch,Me,NewResearch,nodata^)
+        Server(sSetResearch, Me, NewResearch, nodata^);
       end;
-    if (Me=1) and (RO.Turn=800) then
-      begin
-      count:=0;
-      Server(sReload,Me,0,count)
+      if (Me = 1) and (RO.Turn = 800) then
+      begin
+        Count := 0;
+        Server(sReload, Me, 0, Count);
       end
-    else if (RO.Turn>10) and (random(1000)=0) then
-      begin
-      count:=RO.Turn-10;
-      Server(sReload,Me,0,count)
+      else if (RO.Turn > 10) and (Random(1000) = 0) then
+      begin
+        Count := RO.Turn - 10;
+        Server(sReload, Me, 0, Count);
       end
-    else if Server(sTurn,Me,0,nodata^)<rExecuted then
-      Assert(False);
+      else if Server(sTurn, Me, 0, nodata^) < rExecuted then
+        Assert(False);
     end;
-  scContact:
-    if WantNegotiation(Integer(Data), EnemyCalled) then
-      begin
-      if Server(scDipStart, Me, 0, nodata^)<rExecuted then
-        Assert(False);
-      Opponent:=Integer(Data);
-      MyAction:=scDipStart;
+    scContact:
+      if WantNegotiation(Integer(Data), EnemyCalled) then
+      begin
+        if Server(scDipStart, Me, 0, nodata^) < rExecuted then
+          Assert(False);
+        Opponent := Integer(Data);
+        MyAction := scDipStart;
       end
-    else
-      begin
-      if Server(scReject, Me, 0, nodata^)<rExecuted then
-        Assert(False);
+      else
+      begin
+        if Server(scReject, Me, 0, nodata^) < rExecuted then
+          Assert(False);
       end;
-  scDipStart, scDipNotice, scDipAccept, scDipCancelTreaty, scDipOffer, scDipBreak:
+    scDipStart, scDipNotice, scDipAccept, scDipCancelTreaty, scDipOffer, scDipBreak:
     begin
-    OppoAction:=Command;
-    if Command=scDipOffer then OppoOffer:=TOffer(Data);
-    MyLastAction:=MyAction;
-    MyLastOffer:=MyOffer;
-    if (OppoAction=scDipCancelTreaty) or (OppoAction=scDipBreak) then
-      MyAction:=scDipNotice
-    else begin MyAction:=scDipOffer; MyOffer.nDeliver:=0; MyOffer.nCost:=0; end;
-    DoNegotiation;
-    Assert((MyAction=scDipNotice) or (MyAction=scDipAccept)
-      or (MyAction=scDipCancelTreaty) or (MyAction=scDipOffer)
-      or (MyAction=scDipBreak));
-    if MyAction=scDipOffer then Server(MyAction, Me, 0, MyOffer)
-    else Server(MyAction, Me, 0, nodata^);
+      OppoAction := Command;
+      if Command = scDipOffer then OppoOffer := TOffer(Data);
+      MyLastAction := MyAction;
+      MyLastOffer := MyOffer;
+      if (OppoAction = scDipCancelTreaty) or (OppoAction = scDipBreak) then
+        MyAction := scDipNotice
+      else
+      begin
+        MyAction := scDipOffer;
+        MyOffer.nDeliver := 0;
+        MyOffer.nCost := 0;
+      end;
+      DoNegotiation;
+      Assert((MyAction = scDipNotice) or (MyAction = scDipAccept) or
+        (MyAction = scDipCancelTreaty) or (MyAction = scDipOffer) or (MyAction = scDipBreak));
+      if MyAction = scDipOffer then Server(MyAction, Me, 0, MyOffer)
+      else
+        Server(MyAction, Me, 0, nodata^);
     end;
-  cShowEndContact:
-    Opponent:=-1;
+    cShowEndContact:
+      Opponent := -1;
   end;
 end;
@@ -514 +530 @@
 end;
 
-procedure TCustomAI.OnBeforeEnemyAttack(UnitInfo: TUnitInfo; ToLoc, EndHealth,
-  EndHealthDef: Integer);
+procedure TCustomAI.OnBeforeEnemyAttack(UnitInfo: TUnitInfo;
+  ToLoc, EndHealth, EndHealthDef: Integer);
 begin
 end;
@@ -533 +549 @@
 function TCustomAI.ChooseResearchAdvance: Integer;
 begin
-Result:=-1
+  Result := -1;
 end;
 
 function TCustomAI.ChooseStealAdvance: Integer;
 begin
-Result:=-1
+  Result := -1;
 end;
 
 function TCustomAI.ChooseGovernment: Integer;
 begin
-Result:=gDespotism
+  Result := gDespotism;
 end;
 
 function TCustomAI.WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean;
 begin
-Result:=False;
+  Result := False;
 end;
 
 function TCustomAI.OnNegoRejected_CancelTreaty: Boolean;
 begin
-Result:=False;
-end;
+  Result := False;
+end;
+
 {$HINTS ON}
 
 procedure TCustomAI.StealAdvance;
 var
-Steal, ad, count: Integer;
-begin
-Steal:=ChooseStealAdvance;
-if Steal<0 then
+  Steal, ad, Count: Integer;
+begin
+  Steal := ChooseStealAdvance;
+  if Steal < 0 then
   begin // choose random advance
-  count:=0;
-  for ad:=0 to nAdv-1 do if AdvanceStealable(ad) then
-    begin Inc(count); if random(count)=0 then Steal:=ad end
-  end;
-if Steal>=0 then Server(sStealTech,Me,Steal,nodata^);
-RO.Happened:=RO.Happened and not phStealTech
+    Count := 0;
+    for ad := 0 to nAdv - 1 do if AdvanceStealable(ad) then
+      begin
+        Inc(Count);
+        if Random(Count) = 0 then Steal := ad;
+      end;
+  end;
+  if Steal >= 0 then Server(sStealTech, Me, Steal, nodata^);
+  RO.Happened := RO.Happened and not phStealTech;
 end;
 
 function TCustomAI.IsResearched(Advance: Integer): Boolean;
 begin
-Result:= RO.Tech[Advance]>=tsApplicable
+  Result := RO.Tech[Advance] >= tsApplicable;
 end;
 
 function TCustomAI.ResearchCost: Integer;
 begin
-Server(sGetTechCost,Me,0,Result)
+  Server(sGetTechCost, Me, 0, Result);
 end;
 
 function TCustomAI.ChangeAttitude(Nation, Attitude: Integer): Integer;
 begin
-Result:=Server(sSetAttitude+Nation shl 4,Me,Attitude,nodata^)
+  Result := Server(sSetAttitude + Nation shl 4, Me, Attitude, nodata^);
 end;
 
 function TCustomAI.Revolution: Integer;
 begin
-Result:=Server(sRevolution,Me,0,nodata^);
-end;
-
-function TCustomAI.ChangeRates(Tax,Lux: Integer): Integer;
-begin
-Result:=Server(sSetRates,Me,Tax div 10 and $F+Lux div 10 and $F shl 4,nodata^)
+  Result := Server(sRevolution, Me, 0, nodata^);
+end;
+
+function TCustomAI.ChangeRates(Tax, Lux: Integer): Integer;
+begin
+  Result := Server(sSetRates, Me, Tax div 10 and $F + Lux div 10 and $F shl 4, nodata^);
 end;
 
 function TCustomAI.PrepareNewModel(Domain: Integer): Integer;
 begin
-Result:=Server(sCreateDevModel,Me,Domain,nodata^);
+  Result := Server(sCreateDevModel, Me, Domain, nodata^);
 end;
 
 function TCustomAI.SetNewModelFeature(F, Count: Integer): Integer;
 begin
-Result:=Server(sSetDevModelCap+Count shl 4,Me,F,nodata^)
+  Result := Server(sSetDevModelCap + Count shl 4, Me, F, nodata^);
 end;
 
 function TCustomAI.AdvanceResearchable(Advance: Integer): Boolean;
 begin
-Result:= Server(sSetResearch-sExecute,Me,Advance,nodata^)>=rExecuted;
+  Result := Server(sSetResearch - sExecute, Me, Advance, nodata^) >= rExecuted;
 end;
 
 function TCustomAI.AdvanceStealable(Advance: Integer): Boolean;
 begin
-Result:= Server(sStealTech-sExecute,Me,Advance,nodata^)>=rExecuted;
+  Result := Server(sStealTech - sExecute, Me, Advance, nodata^) >= rExecuted;
 end;
 
 function TCustomAI.DebugMessage(Level: Integer; Text: string): Boolean;
 begin
-Text:=Copy('P'+char(48+Me)+' '+Text,1,254);
-Server(sMessage,Me,Level,PChar(Text)^);
-
-Result:=True;
+  Text := Copy('P' + char(48 + Me) + ' ' + Text, 1, 254);
+  Server(sMessage, Me, Level, PChar(Text)^);
+
+  Result := True;
   // always returns true so that it can be used like
   // "assert(DebugMessage(...));" -> not compiled in release build
@@ -629 +649 @@
 function TCustomAI.SetDebugMap(var DebugMap): Boolean;
 begin
-Server(sSetDebugMap, Me, 0, DebugMap);
-
-Result:=True;
+  Server(sSetDebugMap, Me, 0, DebugMap);
+
+  Result := True;
   // always returns true so that it can be used like
   // "assert(SetDebugMap(...));" -> not compiled in release build
@@ -638 +658 @@
 procedure TCustomAI.Unit_FindMyDefender(Loc: Integer; var uix: Integer);
 begin
-if Server(sGetDefender,Me,Loc,uix)<rExecuted then uix:=-1
+  if Server(sGetDefender, Me, Loc, uix) < rExecuted then uix := -1;
 end;
 
 procedure TCustomAI.Unit_FindEnemyDefender(Loc: Integer; var euix: Integer);
 begin
-euix:=RO.nEnemyUn-1;
-while (euix>=0) and (RO.EnemyUn[euix].Loc<>Loc) do
-  Dec(euix);
-end;
-
-function TCustomAI.Unit_Move(uix,ToLoc: Integer): Integer;
-var
-Step: Integer;
-DestinationReached: Boolean;
-Advice: TMoveAdviceData;
-begin
-Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0)); // is a unit
+  euix := RO.nEnemyUn - 1;
+  while (euix >= 0) and (RO.EnemyUn[euix].Loc <> Loc) do
+    Dec(euix);
+end;
+
+function TCustomAI.Unit_Move(uix, ToLoc: Integer): Integer;
+var
+  Step: Integer;
+  DestinationReached: Boolean;
+  Advice: TMoveAdviceData;
+begin
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0)); // is a unit
 {Loc_to_ab(MyUnit[uix].Loc,ToLoc,a,b);
 Assert((A<>0) or (B<>0));
@@ -669 +689 @@
 else}
   begin // move to non-adjacent tile, find shortest path
-  Advice.ToLoc:=ToLoc;
-  Advice.MoreTurns:=9999;
-  Advice.MaxHostile_MovementLeft:=100;
-  Result:=Server(sGetMoveAdvice,Me,uix,Advice);
-  end;
-if Result=eOk then
+    Advice.ToLoc := ToLoc;
+    Advice.MoreTurns := 9999;
+    Advice.MaxHostile_MovementLeft := 100;
+    Result := Server(sGetMoveAdvice, Me, uix, Advice);
+  end;
+  if Result = eOk then
   begin
-  DestinationReached:=False;
-  Step:=0;
-  repeat
-    if Result and (rExecuted or rUnitRemoved)=rExecuted then // check if destination reached
-      if (ToLoc>=0) and (Advice.MoreTurns=0) and (Step=Advice.nStep-1)
-        and ((Map[ToLoc] and (fUnit or fOwned)=fUnit) // attack
-          or (Map[ToLoc] and (fCity or fOwned)=fCity)
-          and ((MyModel[MyUnit[uix].mix].Domain<>dGround) // bombardment
-            or (MyModel[MyUnit[uix].mix].Flags and mdCivil<>0))) then // can't capture
-        begin DestinationReached:=True; Break end // stop next to destination
-      else if Step=Advice.nStep then
-        DestinationReached:=True; // normal move -- stop at destination
-
-    if (Step=Advice.nStep) or (Result<>eOK) and (Result<>eLoaded) then
-      Break;
-
-    Result:=Server(sMoveUnit+(Advice.dx[Step] and 7) shl 4 +(Advice.dy[Step] and 7) shl 7,
-      Me,uix,nodata^);
-    Inc(Step);
-    if RO.Happened and phStealTech<>0 then StealAdvance;
-  until False;
-  if DestinationReached then
-    if Advice.nStep=25 then
-      Result:=Unit_Move(uix,ToLoc) // Shinkansen
-    else if Advice.MoreTurns=0 then
-      Result:=Result or rLocationReached
-    else Result:=Result or rMoreTurns;
+    DestinationReached := False;
+    Step := 0;
+    repeat
+      if Result and (rExecuted or rUnitRemoved) = rExecuted then
+        // check if destination reached
+        if (ToLoc >= 0) and (Advice.MoreTurns = 0) and (Step = Advice.nStep - 1) and
+          ((Map[ToLoc] and (fUnit or fOwned) = fUnit) // attack
+          or (Map[ToLoc] and (fCity or fOwned) = fCity) and
+          ((MyModel[MyUnit[uix].mix].Domain <> dGround) // bombardment
+          or (MyModel[MyUnit[uix].mix].Flags and mdCivil <> 0))) then // can't capture
+        begin
+          DestinationReached := True;
+          Break;
+        end // stop next to destination
+        else if Step = Advice.nStep then
+          DestinationReached := True; // normal move -- stop at destination
+
+      if (Step = Advice.nStep) or (Result <> eOK) and (Result <> eLoaded) then
+        Break;
+
+      Result := Server(sMoveUnit + (Advice.dx[Step] and 7) shl 4 +
+        (Advice.dy[Step] and 7) shl 7, Me, uix, nodata^);
+      Inc(Step);
+      if RO.Happened and phStealTech <> 0 then StealAdvance;
+    until False;
+    if DestinationReached then
+      if Advice.nStep = 25 then
+        Result := Unit_Move(uix, ToLoc) // Shinkansen
+      else if Advice.MoreTurns = 0 then
+        Result := Result or rLocationReached
+      else
+        Result := Result or rMoreTurns;
+  end;
+end;
+
+function TCustomAI.Unit_Step(uix, ToLoc: Integer): Integer;
+var
+  A, B: Integer;
+begin
+  Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
+  Assert(((A <> 0) or (B <> 0)) and (A >= -1) and (A <= 1) and (B >= -1) and (B <= 1));
+  Result := Server(sMoveUnit + ((A - B) and 7) shl 4 + ((A + B) and 7) shl 7, Me, uix, nodata^);
+  if RO.Happened and phStealTech <> 0 then StealAdvance;
+end;
+
+function TCustomAI.Unit_Attack(uix, ToLoc: Integer): Integer;
+var
+  A, B: Integer;
+begin
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
+    and ((Map[ToLoc] and (fUnit or fOwned) = fUnit) // is an attack
+    or (Map[ToLoc] and (fCity or fOwned) = fCity) and
+    (MyModel[MyUnit[uix].mix].Domain <> dGround))); // is a bombardment
+  Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
+  Assert(((A <> 0) or (B <> 0)) and (A >= -1) and (A <= 1) and (B >= -1) and (B <= 1));
+  // attack to adjacent tile
+  Result := Server(sMoveUnit + (A - B) and 7 shl 4 + (A + B) and 7 shl 7, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_DoMission(uix, MissionType, ToLoc: Integer): Integer;
+var
+  A, B: Integer;
+begin
+  Result := Server(sSetSpyMission + MissionType shl 4, Me, 0, nodata^);
+  if Result >= rExecuted then
+  begin
+    Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
+      and (MyModel[MyUnit[uix].mix].Kind = mkDiplomat)); // is a commando
+    Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
+    Assert(((A <> 0) or (B <> 0)) and (A >= -1) and (A <= 1) and (B >= -1) and (B <= 1));
+    // city must be adjacent
+    Result := Server(sMoveUnit - sExecute + (A - B) and 7 shl 4 + (A + B) and 7 shl 7, Me, uix, nodata^);
+    if Result = eMissionDone then
+      Result := Server(sMoveUnit + (A - B) and 7 shl 4 + (A + B) and 7 shl 7, Me, uix, nodata^)
+    else if (Result <> eNoTime_Move) and (Result <> eTreaty) and (Result <> eNoTurn) then
+      Result := eInvalid; // not a special commando mission!
+  end;
+end;
+
+function TCustomAI.Unit_MoveForecast(uix, ToLoc: Integer;
+  var RemainingMovement: Integer): Boolean;
+var
+  Advice: TMoveAdviceData;
+begin
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0)); // is a unit
+  Advice.ToLoc := ToLoc;
+  Advice.MoreTurns := 0;
+  Advice.MaxHostile_MovementLeft := 100;
+  if Server(sGetMoveAdvice, Me, uix, Advice) = eOk then
+  begin
+    RemainingMovement := Advice.MaxHostile_MovementLeft;
+    Result := True;
   end
-end;
-
-function TCustomAI.Unit_Step(uix,ToLoc: Integer): Integer;
-var
-A,B: Integer;
-begin
-Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
-Assert(((A<>0) or (B<>0)) and (A>=-1) and (A<=1) and (B>=-1) and (B<=1));
-Result:=Server(sMoveUnit+((A-B) and 7) shl 4 +((A+B) and 7) shl 7, Me, uix, nodata^);
-if RO.Happened and phStealTech<>0 then StealAdvance;
-end;
-
-function TCustomAI.Unit_Attack(uix,ToLoc: Integer): Integer;
-var
-A,B: Integer;
-begin
-Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
-  and ((Map[ToLoc] and (fUnit or fOwned)=fUnit) // is an attack
-  or (Map[ToLoc] and (fCity or fOwned)=fCity)
-  and (MyModel[MyUnit[uix].mix].Domain<>dGround))); // is a bombardment
-Loc_to_ab(MyUnit[uix].Loc,ToLoc,A,B);
-Assert(((A<>0) or (B<>0)) and (A>=-1) and (A<=1) and (B>=-1) and (B<=1)); // attack to adjacent tile
-Result:=Server(sMoveUnit+(A-B) and 7 shl 4 +(A+B) and 7 shl 7,Me,uix,nodata^);
-end;
-
-function TCustomAI.Unit_DoMission(uix,MissionType,ToLoc: Integer): Integer;
-var
-A,B: Integer;
-begin
-Result:=Server(sSetSpyMission + MissionType shl 4,Me,0,nodata^);
-if Result>=rExecuted then
+  else
   begin
-  Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
-    and (MyModel[MyUnit[uix].mix].Kind=mkDiplomat)); // is a commando
-  Loc_to_ab(MyUnit[uix].Loc,ToLoc,A,B);
-  Assert(((A<>0) or (B<>0)) and (A>=-1) and (A<=1) and (B>=-1) and (B<=1)); // city must be adjacent
-  Result:=Server(sMoveUnit-sExecute+(A-B) and 7 shl 4 +(A+B) and 7 shl 7,Me,uix,nodata^);
-  if Result=eMissionDone then
-    Result:=Server(sMoveUnit+(A-B) and 7 shl 4 +(A+B) and 7 shl 7,Me,uix,nodata^)
-  else if (Result<>eNoTime_Move) and (Result<>eTreaty) and (Result<>eNoTurn) then
-    Result:=eInvalid // not a special commando mission!
-  end
-end;
-
-function TCustomAI.Unit_MoveForecast(uix,ToLoc: Integer;
-  var RemainingMovement: Integer): Boolean;
-var
-Advice: TMoveAdviceData;
-begin
-Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0)); // is a unit
-Advice.ToLoc:=ToLoc;
-Advice.MoreTurns:=0;
-Advice.MaxHostile_MovementLeft:=100;
-if Server(sGetMoveAdvice,Me,uix,Advice)=eOk then
+    RemainingMovement := -1;
+    Result := False;
+  end;
+end;
+
+function TCustomAI.Unit_AttackForecast(uix, ToLoc, AttackMovement: Integer;
+  var RemainingHealth: Integer): Boolean;
+var
+  BattleForecast: TBattleForecast;
+begin
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
+    and (Map[ToLoc] and (fUnit or fOwned) = fUnit)); // is an attack
+  RemainingHealth := -$100;
+  Result := False;
+  if AttackMovement >= 0 then with MyUnit[uix] do
+    begin
+      BattleForecast.pAtt := Me;
+      BattleForecast.mixAtt := mix;
+      BattleForecast.HealthAtt := Health;
+      BattleForecast.ExpAtt := Exp;
+      BattleForecast.FlagsAtt := Flags;
+      BattleForecast.Movement := AttackMovement;
+      if Server(sGetBattleForecast, Me, ToLoc, BattleForecast) >= rExecuted then
+      begin
+        if BattleForecast.EndHealthAtt > 0 then
+          RemainingHealth := BattleForecast.EndHealthAtt
+        else
+          RemainingHealth := -BattleForecast.EndHealthDef;
+        Result := True;
+      end;
+    end;
+end;
+
+function TCustomAI.Unit_DefenseForecast(euix, ToLoc: Integer;
+  var RemainingHealth: Integer): Boolean;
+var
+  BattleForecast: TBattleForecast;
+begin
+  Assert((euix >= 0) and (euix < RO.nEnemyUn) and (RO.EnemyUn[euix].Loc >= 0) // is an enemy unit
+    and (Map[ToLoc] and (fUnit or fOwned) = (fUnit or fOwned))); // is an attack
+  RemainingHealth := $100;
+  Result := False;
+  with RO.EnemyUn[euix] do
   begin
-  RemainingMovement:=Advice.MaxHostile_MovementLeft;
-  Result:=True
-  end
-else
+    BattleForecast.pAtt := Owner;
+    BattleForecast.mixAtt := mix;
+    BattleForecast.HealthAtt := Health;
+    BattleForecast.ExpAtt := Exp;
+    BattleForecast.FlagsAtt := Flags;
+    BattleForecast.Movement := 100;
+    if Server(sGetBattleForecast, Me, ToLoc, BattleForecast) >= rExecuted then
+    begin
+      if BattleForecast.EndHealthDef > 0 then
+        RemainingHealth := BattleForecast.EndHealthDef
+      else
+        RemainingHealth := -BattleForecast.EndHealthAtt;
+      Result := True;
+    end;
+  end;
+end;
+
+function TCustomAI.Unit_Disband(uix: Integer): Integer;
+begin
+  Result := Server(sRemoveUnit, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_StartJob(uix, NewJob: Integer): Integer;
+begin
+  Result := Server(sStartJob + NewJob shl 4, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_SetHomeHere(uix: Integer): Integer;
+begin
+  Result := Server(sSetUnitHome, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_Load(uix: Integer): Integer;
+begin
+  Result := Server(sLoadUnit, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_Unload(uix: Integer): Integer;
+begin
+  Result := Server(sUnloadUnit, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_AddToCity(uix: Integer): Integer;
+begin
+  Result := Server(sAddToCity, Me, uix, nodata^);
+end;
+
+procedure TCustomAI.City_FindMyCity(Loc: Integer; var cix: Integer);
+begin
+  if Map[Loc] and (fCity or fOwned) <> fCity or fOwned then
+    cix := -1
+  else
   begin
-  RemainingMovement:=-1;
-  Result:=False
-  end
-end;
-
-function TCustomAI.Unit_AttackForecast(uix,ToLoc,AttackMovement: Integer;
-  var RemainingHealth: Integer): Boolean;
-var
-BattleForecast: TBattleForecast;
-begin
-Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
-  and (Map[ToLoc] and (fUnit or fOwned)=fUnit)); // is an attack
-RemainingHealth:=-$100;
-Result:=False;
-if AttackMovement>=0 then with MyUnit[uix] do
+    cix := RO.nCity - 1;
+    while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
+      Dec(cix);
+  end;
+end;
+
+procedure TCustomAI.City_FindEnemyCity(Loc: Integer; var ecix: Integer);
+begin
+  if Map[Loc] and (fCity or fOwned) <> fCity then
+    ecix := -1
+  else
   begin
-  BattleForecast.pAtt:=Me;
-  BattleForecast.mixAtt:=mix;
-  BattleForecast.HealthAtt:=Health;
-  BattleForecast.ExpAtt:=Exp;
-  BattleForecast.FlagsAtt:=Flags;
-  BattleForecast.Movement:=AttackMovement;
-  if Server(sGetBattleForecast,Me,ToLoc,BattleForecast)>=rExecuted then
-    begin
-    if BattleForecast.EndHealthAtt>0 then
-      RemainingHealth:=BattleForecast.EndHealthAtt
-    else RemainingHealth:=-BattleForecast.EndHealthDef;
-    Result:=True
-    end
-  end
-end;
-
-function TCustomAI.Unit_DefenseForecast(euix,ToLoc: Integer;
-  var RemainingHealth: Integer): Boolean;
-var
-BattleForecast: TBattleForecast;
-begin
-Assert((euix>=0) and (euix<RO.nEnemyUn) and (RO.EnemyUn[euix].Loc>=0) // is an enemy unit
-  and (Map[ToLoc] and (fUnit or fOwned)=(fUnit or fOwned))); // is an attack
-RemainingHealth:=$100;
-Result:=False;
-with RO.EnemyUn[euix] do
+    ecix := RO.nEnemyCity - 1;
+    while (ecix >= 0) and (RO.EnemyCity[ecix].Loc <> Loc) do
+      Dec(ecix);
+  end;
+end;
+
+function TCustomAI.City_HasProject(cix: Integer): Boolean;
+begin
+  Result := MyCity[cix].Project and (cpImp + cpIndex) <> cpImp + imTrGoods;
+end;
+
+function TCustomAI.City_CurrentImprovementProject(cix: Integer): Integer;
+begin
+  if MyCity[cix].Project and cpImp = 0 then Result := -1
+  else
   begin
-  BattleForecast.pAtt:=Owner;
-  BattleForecast.mixAtt:=mix;
-  BattleForecast.HealthAtt:=Health;
-  BattleForecast.ExpAtt:=Exp;
-  BattleForecast.FlagsAtt:=Flags;
-  BattleForecast.Movement:=100;
-  if Server(sGetBattleForecast,Me,ToLoc,BattleForecast)>=rExecuted then
-    begin
-    if BattleForecast.EndHealthDef>0 then
-      RemainingHealth:=BattleForecast.EndHealthDef
-    else RemainingHealth:=-BattleForecast.EndHealthAtt;
-    Result:=True
-    end
-  end
-end;
-
-function TCustomAI.Unit_Disband(uix: Integer): Integer;
-begin
-Result:=Server(sRemoveUnit,Me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_StartJob(uix,NewJob: Integer): Integer;
-begin
-Result:=Server(sStartJob+NewJob shl 4,Me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_SetHomeHere(uix: Integer): Integer;
-begin
-Result:=Server(sSetUnitHome,Me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_Load(uix: Integer): Integer;
-begin
-Result:=Server(sLoadUnit,Me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_Unload(uix: Integer): Integer;
-begin
-Result:=Server(sUnloadUnit,Me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_AddToCity(uix: Integer): Integer;
-begin
-Result:=Server(sAddToCity,Me,uix,nodata^)
-end;
-
-
-procedure TCustomAI.City_FindMyCity(Loc: Integer; var cix: Integer);
-begin
-if Map[Loc] and (fCity or fOwned)<>fCity or fOwned then
-  cix:=-1
-else
-  begin
-  cix:=RO.nCity-1;
-  while (cix>=0) and (MyCity[cix].Loc<>Loc) do
-    Dec(cix);
-  end
-end;
-
-procedure TCustomAI.City_FindEnemyCity(Loc: Integer; var ecix: Integer);
-begin
-if Map[Loc] and (fCity or fOwned)<>fCity then
-  ecix:=-1
-else
-  begin
-  ecix:=RO.nEnemyCity-1;
-  while (ecix>=0) and (RO.EnemyCity[ecix].Loc<>Loc) do
-    Dec(ecix);
-  end
-end;
-
-function TCustomAI.City_HasProject(cix: Integer): Boolean;
-begin
-Result:= MyCity[cix].Project and (cpImp+cpIndex)<>cpImp+imTrGoods
-end;
-
-function TCustomAI.City_CurrentImprovementProject(cix: Integer): Integer;
-begin
-if MyCity[cix].Project and cpImp=0 then Result:=-1
-else
-  begin
-  Result:=MyCity[cix].Project and cpIndex;
-  if Result=imTrGoods then Result:=-1
-  end
+    Result := MyCity[cix].Project and cpIndex;
+    if Result = imTrGoods then Result := -1;
+  end;
 end;
 
 function TCustomAI.City_CurrentUnitProject(cix: Integer): Integer;
 begin
-if MyCity[cix].Project and cpImp<>0 then Result:=-1
-else Result:=MyCity[cix].Project and cpIndex;
-end;
-
-function TCustomAI.City_GetTileInfo(cix,TileLoc: Integer; var TileInfo: TTileInfo): Integer;
-begin
-TileInfo.ExplCity:=cix;
-Result:=Server(sGetHypoCityTileInfo,Me,TileLoc,TileInfo)
+  if MyCity[cix].Project and cpImp <> 0 then Result := -1
+  else
+    Result := MyCity[cix].Project and cpIndex;
+end;
+
+function TCustomAI.City_GetTileInfo(cix, TileLoc: Integer;
+  var TileInfo: TTileInfo): Integer;
+begin
+  TileInfo.ExplCity := cix;
+  Result := Server(sGetHypoCityTileInfo, Me, TileLoc, TileInfo);
 end;
 
 function TCustomAI.City_GetReport(cix: Integer; var Report: TCityReport): Integer;
 begin
-Report.HypoTiles:=-1;
-Report.HypoTax:=-1;
-Report.HypoLux:=-1;
-Result:=Server(sGetCityReport,Me,cix,Report)
+  Report.HypoTiles := -1;
+  Report.HypoTax := -1;
+  Report.HypoLux := -1;
+  Result := Server(sGetCityReport, Me, cix, Report);
 end;
 
@@ -916 +946 @@
   var Report: TCityReport): Integer;
 begin
-Report.HypoTiles:=HypoTiles;
-Report.HypoTax:=HypoTax;
-Report.HypoLux:=HypoLux;
-Result:=Server(sGetCityReport,Me,cix,Report)
+  Report.HypoTiles := HypoTiles;
+  Report.HypoTax := HypoTax;
+  Report.HypoLux := HypoLux;
+  Result := Server(sGetCityReport, Me, cix, Report);
 end;
 
 function TCustomAI.City_GetAreaInfo(cix: Integer; var AreaInfo: TCityAreaInfo): Integer;
 begin
-Result:=Server(sGetCityAreaInfo,Me,cix,AreaInfo)
-end;
-
-function TCustomAI.City_StartUnitProduction(cix,mix: Integer): Integer;
-begin
-Result:=Server(sSetCityProject,Me,cix,mix)
-end;
-
-function TCustomAI.City_StartEmigration(cix,mix: Integer;
+  Result := Server(sGetCityAreaInfo, Me, cix, AreaInfo);
+end;
+
+function TCustomAI.City_StartUnitProduction(cix, mix: Integer): Integer;
+begin
+  Result := Server(sSetCityProject, Me, cix, mix);
+end;
+
+function TCustomAI.City_StartEmigration(cix, mix: Integer;
   AllowDisbandCity, AsConscripts: Boolean): Integer;
 var
-NewProject: Integer;
-begin
-NewProject:=mix;
-if AllowDisbandCity then NewProject:=NewProject or cpDisbandCity;
-if AsConscripts then NewProject:=NewProject or cpConscripts;
-Result:=Server(sSetCityProject,Me,cix,NewProject)
-end;
-
-function TCustomAI.City_StartImprovement(cix,iix: Integer): Integer;
-var
-NewProject: Integer;
-begin
-NewProject:=iix+cpImp;
-Result:=Server(sSetCityProject,Me,cix,NewProject)
-end;
-
-function TCustomAI.City_Improvable(cix,iix: Integer): Boolean;
-var
-NewProject: Integer;
-begin
-NewProject:=iix+cpImp;
-Result:= Server(sSetCityProject-sExecute,Me,cix,NewProject)>=rExecuted;
+  NewProject: Integer;
+begin
+  NewProject := mix;
+  if AllowDisbandCity then NewProject := NewProject or cpDisbandCity;
+  if AsConscripts then NewProject := NewProject or cpConscripts;
+  Result := Server(sSetCityProject, Me, cix, NewProject);
+end;
+
+function TCustomAI.City_StartImprovement(cix, iix: Integer): Integer;
+var
+  NewProject: Integer;
+begin
+  NewProject := iix + cpImp;
+  Result := Server(sSetCityProject, Me, cix, NewProject);
+end;
+
+function TCustomAI.City_Improvable(cix, iix: Integer): Boolean;
+var
+  NewProject: Integer;
+begin
+  NewProject := iix + cpImp;
+  Result := Server(sSetCityProject - sExecute, Me, cix, NewProject) >= rExecuted;
 end;
 
 function TCustomAI.City_StopProduction(cix: Integer): Integer;
 var
-NewProject: Integer;
-begin
-NewProject:=imTrGoods+cpImp;
-Result:=Server(sSetCityProject,Me,cix,NewProject)
+  NewProject: Integer;
+begin
+  NewProject := imTrGoods + cpImp;
+  Result := Server(sSetCityProject, Me, cix, NewProject);
 end;
 
 function TCustomAI.City_BuyProject(cix: Integer): Integer;
 begin
-Result:=Server(sBuyCityProject,Me,cix,nodata^)
-end;
-
-function TCustomAI.City_SellImprovement(cix,iix: Integer): Integer;
-begin
-Result:=Server(sSellCityImprovement,Me,cix,iix)
-end;
-
-function TCustomAI.City_RebuildImprovement(cix,iix: Integer): Integer;
-begin
-Result:=Server(sRebuildCityImprovement,Me,cix,iix)
-end;
-
-function TCustomAI.City_SetTiles(cix,NewTiles: Integer): Integer;
-begin
-Result:=Server(sSetCityTiles,Me,cix,NewTiles)
-end;
-
+  Result := Server(sBuyCityProject, Me, cix, nodata^);
+end;
+
+function TCustomAI.City_SellImprovement(cix, iix: Integer): Integer;
+begin
+  Result := Server(sSellCityImprovement, Me, cix, iix);
+end;
+
+function TCustomAI.City_RebuildImprovement(cix, iix: Integer): Integer;
+begin
+  Result := Server(sRebuildCityImprovement, Me, cix, iix);
+end;
+
+function TCustomAI.City_SetTiles(cix, NewTiles: Integer): Integer;
+begin
+  Result := Server(sSetCityTiles, Me, cix, NewTiles);
+end;
 
 // negotiation
 function TCustomAI.Nego_CheckMyAction: Integer;
 begin
-Assert(Opponent>=0); // only allowed in negotiation mode
-Assert((MyAction=scDipNotice) or (MyAction=scDipAccept)
-  or (MyAction=scDipCancelTreaty) or (MyAction=scDipOffer)
-  or (MyAction=scDipBreak));
-if MyAction=scDipOffer then Result:=Server(MyAction-sExecute, Me, 0, MyOffer)
-else Result:=Server(MyAction-sExecute, Me, 0, nodata^);
-end;
-
+  Assert(Opponent >= 0); // only allowed in negotiation mode
+  Assert((MyAction = scDipNotice) or (MyAction = scDipAccept) or
+    (MyAction = scDipCancelTreaty) or (MyAction = scDipOffer) or (MyAction = scDipBreak));
+  if MyAction = scDipOffer then Result := Server(MyAction - sExecute, Me, 0, MyOffer)
+  else
+    Result := Server(MyAction - sExecute, Me, 0, nodata^);
+end;
 
 initialization
-nodata:=Pointer(0);
-RWDataSize:=0;
+  nodata := Pointer(0);
+  RWDataSize := 0;
 
 end.
-

trunk/AI/StdAI/ToolAI.pas

@@ -420 +420 @@
             begin
               Inc(BestCount);
-              if random(BestCount) = 0 then
+              if Random(BestCount) = 0 then
               begin
                 BestScore := TestScore;
@@ -1129 +1129 @@
         begin
           Loc_to_ab(MyUnit[uix].Loc, MyUnit[uixTransportLoad[tuix]].Loc, A, B);
-          if (abs(A) <= 1) and (abs(B) <= 1) then
+          if (Abs(A) <= 1) and (Abs(B) <= 1) then
           begin
             Assert((A <> 0) or (B <> 0));
@@ -1146 +1146 @@
           begin
             Loc_to_ab(TransportPlan.LoadLoc, MyUnit[uixTransportLoad[tuix]].Loc, A, B);
-            if (abs(A) <= 1) and (abs(B) <= 1) then
+            if (Abs(A) <= 1) and (Abs(B) <= 1) then
             begin
               TransportPlan.uixLoad[TransportPlan.nLoad] := uixTransportLoad[tuix];

trunk/CityProcessing.pas

@@ -665 +665 @@
             dy := V21 shr 2 - 3;
             dx := V21 and 3 shl 1 - 3 + (dy + 3) and 1;
-            Dist := abs(dx) + abs(dy) + abs(abs(dx) - abs(dy)) shr 1;
+            Dist := Abs(dx) + Abs(dy) + Abs(Abs(dx) - Abs(dy)) shr 1;
             if (Resources > Best) or (Resources = Best) and (Dist < BestDist)
             then

trunk/Database.pas

@@ -510 +510 @@
 begin
   dxdy(Loc0, Loc1, dx, dy);
-  dx := abs(dx);
-  dy := abs(dy);
-  Result := dx + dy + abs(dx - dy) shr 1;
+  dx := Abs(dx);
+  dy := Abs(dy);
+  Result := dx + dy + Abs(dx - dy) shr 1;
 end;
 
@@ -978 +978 @@
   ShSwamp = 25; { of grassland }
   MinRivLen = 3;
-  unification = 70;
-  hotunification = 50; // min. 25
+  Unification = 70;
+  HotUnification = 50; // min. 25
 
   Zone: array [0 .. 3, 2 .. 9] of Single = { terrain distribution }
@@ -1165 +1165 @@
     CopyFrom[Loc0] := Loc0;
 
-  for N := 0 to unification * MapSize div 100 do
+  for N := 0 to Unification * MapSize div 100 do
   begin
     Y := DelphiRandom(ly);
-    if abs(Y - (ly shr 1)) > ly div 4 + DelphiRandom(ly * hotunification div 100) then
+    if Abs(Y - (ly shr 1)) > ly div 4 + DelphiRandom(ly * HotUnification div 100) then
       if Y < ly shr 1 then
         Y := ly shr 1 - Y
@@ -2792 +2792 @@
   begin
     dxMax := dy and 1;
-    while abs(dy) + (dxMax + 2) + abs(abs(dy) - (dxMax + 2)) shr 1 <=
+    while Abs(dy) + (dxMax + 2) + Abs(Abs(dy) - (dxMax + 2)) shr 1 <=
       CountryRadius do
       Inc(dxMax, 2);
@@ -2904 +2904 @@
     begin
       dxMax := dy and 1;
-      while abs(dy) + (dxMax + 2) + abs(abs(dy) - (dxMax + 2)) shr 1 <=
+      while Abs(dy) + (dxMax + 2) + Abs(Abs(dy) - (dxMax + 2)) shr 1 <=
         CountryRadius do
         Inc(dxMax, 2);

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;

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -87 +87 @@
 procedure VDarkGradient(Canvas: TCanvas; X, Y, Height, Kind: Integer);
 procedure UnderlinedTitleValue(Canvas: TCanvas; Title, Value: string; X, Y, Width: Integer);
-procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string; val: Integer;
+procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string; Val: Integer;
   T: TTexture);
 procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
-  Cap: string; val: Integer; T: TTexture);
+  Cap: string; Val: Integer; T: TTexture);
 procedure PaintProgressBar(Canvas: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
   T: TTexture);
@@ -1397 +1397 @@
 
 procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string;
-  val: Integer; T: TTexture);
+  Val: Integer; T: TTexture);
 var
   S: string;
 begin
-  if val > 0 then
+  if Val > 0 then
   begin
     DLine(Dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade,
       T.ColorBevelLight);
     LoweredTextOut(Dst.Canvas, -1, T, X - 2, Y, Cap);
-    S := IntToStr(val);
+    S := IntToStr(Val);
     RisedTextOut(Dst.Canvas, X + 170 - BiColorTextWidth(Dst.Canvas,
       S), Y, S);
@@ -1413 +1413 @@
 
 procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
-  Cap: string; val: Integer; T: TTexture);
+  Cap: string; Val: Integer; T: TTexture);
 var
   I, sd, ld, cl, xIcon, yIcon: Integer;
   S: string;
 begin
-  // val:=random(40); //!!!
-  if val = 0 then
+  // Val := Random(40); //!!!
+  if Val = 0 then
     Exit;
   Assert(Kind >= 0);
@@ -1433 +1433 @@
       T.ColorBevelLight);
 
-    S := IntToStr(val);
-    if val < 0 then
+    S := IntToStr(Val);
+    if Val < 0 then
       cl := $0000FF
     else
@@ -1442 +1442 @@
       xIcon + W + 2 - BiColorTextWidth(Dst.Canvas, S), yIcon, S);
 
-    if (Kind = 12) and (val >= 100) then
+    if (Kind = 12) and (Val >= 100) then
     begin // science with symbol for 100
-      val := val div 10;
-      sd := 14 * (val div 10 + val mod 10 - 1);
+      Val := Val div 10;
+      sd := 14 * (Val div 10 + Val mod 10 - 1);
       if sd = 0 then
         sd := 1;
@@ -1452 +1452 @@
       else
         ld := W - 44;
-      for I := 0 to val mod 10 - 1 do
+      for I := 0 to Val mod 10 - 1 do
       begin
         BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 2 + 1, 14,
@@ -1460 +1460 @@
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
-      for I := 0 to val div 10 - 1 do
+      for I := 0 to Val div 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + (val mod 10) *
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + (Val mod 10) *
           (14 * ld div sd) + I * (14 * ld div sd), yIcon + 3, 14, 14,
           HGrSystem.Mask.Canvas, 67 + 7 mod 8 * 15,
           70 + 7 div 8 * 15, SRCAND);
-        Sprite(Dst, HGrSystem, xIcon + 3 + (val mod 10) *
+        Sprite(Dst, HGrSystem, xIcon + 3 + (Val mod 10) *
           (14 * ld div sd) + I * (14 * ld div sd), yIcon + 2, 14,
           14, 67 + 7 mod 8 * 15,
@@ -1474 +1474 @@
     else
     begin
-      val := abs(val);
-      if val mod 10 = 0 then
-        sd := 14 * (val div 10 - 1)
+      Val := Abs(Val);
+      if Val mod 10 = 0 then
+        sd := 14 * (Val div 10 - 1)
       else
-        sd := 10 * (val mod 10 - 1) + 14 * (val div 10);
+        sd := 10 * (Val mod 10 - 1) + 14 * (Val div 10);
       if sd = 0 then
         sd := 1;
@@ -1485 +1485 @@
       else
         ld := W - 44;
-      for I := 0 to val div 10 - 1 do
+      for I := 0 to Val div 10 - 1 do
       begin
         BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 3, 14, 14,
@@ -1493 +1493 @@
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
-      for I := 0 to val mod 10 - 1 do
+      for I := 0 to Val mod 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + (val div 10) *
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + (Val div 10) *
           (14 * ld div sd) + I * (10 * ld div sd), yIcon + 7, 10, 10,
           HGrSystem.Mask.Canvas, 66 + Kind mod 11 * 11,
           115 + Kind div 11 * 11, SRCAND);
-        Sprite(Dst, HGrSystem, xIcon + 3 + (val div 10) *
+        Sprite(Dst, HGrSystem, xIcon + 3 + (Val div 10) *
           (14 * ld div sd) + I * (10 * ld div sd), yIcon + 6, 10,
           10, 66 + Kind mod 11 * 11,

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -21 +21 @@
 function ScrollDC(Canvas: TCanvas; dx: Longint; dy: Longint; const lprcScroll: TRect;
   const lprcClip:TRect; hrgnUpdate: Handle; lprcUpdate: PRect): Boolean; overload;
+function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND;
+  X, Y, cx, cy: Integer; uFlags: UINT): Boolean;
 function ScaleToNative(Value: Integer): Integer;
 function ScaleToNativeDist(Base, Value: Integer): Integer;
@@ -84 +86 @@
 end;
 
-function Ceil(const X: Single): Integer;
-begin
-  if X > High(Integer) then
-    Result := High(Integer)
-  else if X < Low(Integer) then
-    Result := Low(Integer)
-  else begin
-    Result := Trunc(X);
-    if (Result <> X) then begin
-      if (Result > 0) then Inc(Result) else Dec(Result);
-    end;
-  end;
+function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND; X, Y, cx, cy: Integer;
+  uFlags: UINT): Boolean;
+begin
+  LCLIntf.SetWindowPos(hWnd, hWndInsertAfter, ScaleToNative(X), ScaleToNative(Y),
+    ScaleToNative(cx), ScaleToNative(cy), uFlags);
 end;
 
@@ -110 +105 @@
 function ScaleFromNative(Value: Integer): Integer;
 begin
-  Result := Floor(Value * 96 / ScreenInfo.Dpi);
+  Result := Round(Value * 96 / ScreenInfo.Dpi);
 end;