Merge pull request #21 from FoxAhead/dev-theta

Dev theta

src/Civ2Types.pas

@@ -513,7 +513,7 @@ interface
     ListItemMaxHeight: Integer;
   end;
 
-  TDrawPort = packed record               // Part of TGraphicsInfo; TODO: Move to TGraphicsInfo
+  TDrawPort = packed record               // Part of TGraphicsInfo;
     _Proc: Pointer;
     Width: Integer;
     Height: Integer;

src/Civ2UIA.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=1
 MinorVer=20
-Release=0
-Build=708
+Release=1
+Build=724
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=
 FileDescription=
-FileVersion=1.20.0.708
+FileVersion=1.20.1.724
 InternalName=
 LegalCopyright=
 LegalTrademarks=

src/Civ2UIA.dpr

@@ -871,6 +871,13 @@ begin
     Canvas.TextOutWithShadows(TextOut, 0, 0, DT_CENTER or DT_VCENTER);
     Canvas.Free;
   end;
+
+  // Debug: unit index
+  {Canvas := TCanvasEx.Create(DrawPort);
+  TextOut := IntToStr(UnitIndex);
+  Canvas.MoveTo(Left + ScaleByZoom(32, Zoom), Top + ScaleByZoom(16, Zoom));
+  Canvas.TextOutWithShadows(TextOut, 0, 0, DT_CENTER or DT_VCENTER);
+  Canvas.Free;}
 end;
 
 procedure PatchDrawSideBarEx; stdcall;
@@ -1581,12 +1588,15 @@ asm
     ret
 end;
 
-procedure PatchBreakUnitMoving; register;
+procedure PatchBreakUnitMoving(UnitIndex: Integer); cdecl;
+var
+  Unit1: PUnit;
 begin
-  if not Ex.SettingsFlagSet(2) then
-    asm
-    mov   eax, $0042738C
-    jmp   eax
+  Unit1 := @Civ2.Units[UnitIndex];
+  if (Civ2.GameParameters.HumanPlayers and (1 shl Unit1.CivIndex) = 0) or (not Ex.SettingsFlagSet(2)) then
+    if ((Unit1.Orders and $F) = $B) and (Civ2.UnitTypes[Unit1.UnitType].Role <> 7) then
+    begin
+      Unit1.Orders := -1;
     end;
 end;
 
@@ -2902,7 +2912,7 @@ begin
       begin
         Building := -City.Building;
         Text := string(Civ2.GetStringInList(Civ2.Improvements[Building].StringIndex)) + ' ';
-        if Building > 39 then
+        if Building >= 39 then
         begin
           Civ2.SetFontColorWithShadow($5E, $A, -1, -1);
         end;