Changeset 349 for branches/highdpi/LocalPlayer/ClientTools.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/ClientTools.pas (modified) (4 diffs)

branches/highdpi/LocalPlayer/ClientTools.pas

@@ -16 +16 @@
   TEnhancementJobs = array [0 .. 11, 0 .. 7] of byte;
   JobResultSet = set of 0 .. 39;
+
+  TMapOption = (
+    // options switched by buttons
+    moPolitical = 0, moCityNames = 1, moGreatWall = 4, moGrid = 5, moBareTerrain = 6,
+    // other options
+    moEditMode = 16, moLocCodes = 17
+  );
+  TMapOptions = set of TMapOption;
+
+  TSaveOption = (soAlEffectiveMovesOnly = 0, soEnMoves = 1, soEnAttacks = 2,
+    soEnNoMoves = 3, soWaitTurn = 4, soEffectiveMovesOnly = 5, soEnFastMoves = 6,
+    soSlowMoves = 7, soFastMoves = 8, soVeryFastMoves = 9, soNames = 10,
+    soRepList = 11, soRepScreens = 12, soSoundOff = 13, soSoundOn = 14,
+    soSoundOnAlt = 15, soScrollSlow = 16, soScrollFast = 17, soScrollOff = 18,
+    soAlSlowMoves = 19, soAlFastMoves = 20, somAlNoMoves = 21, soTellAI = 30);
+  TSaveOptions = set of TSaveOption;
 
 var
@@ -59 +75 @@
 procedure CityOptimizer_AfterRemoveUnit;
 procedure CityOptimizer_EndOfTurn;
+function GetMyCityByLoc(Loc: Integer): PCity;
+function GetEnemyCityByLoc(Loc: Integer): PCityInfo;
+function GetMyUnitByLoc(Loc: Integer): PUn;
+function GetEnemyUnitByLoc(Loc: Integer): PUnitInfo;
 
 
@@ -241 +261 @@
       Inc(Result, CityReport.FoodSurplus);
   end;
-  for i := 28 to nImp - 1 do
+  for i := nWonder to nImp - 1 do
     if MyCity[cix].Built[i] > 0 then
       Dec(Result, Imp[i].Maint);
@@ -696 +716 @@
 end;
 
+function GetMyCityByLoc(Loc: Integer): PCity;
+var
+  I: Integer;
+begin
+  I := MyRO.nCity - 1;
+  while (I >= 0) and (MyCity[I].Loc <> Loc) do Dec(I);
+  if I >= 0 then Result := @MyCity[I]
+    else Result := nil;
+end;
+
+function GetEnemyCityByLoc(Loc: Integer): PCityInfo;
+var
+  I: Integer;
+begin
+  I := MyRO.nEnemyCity - 1;
+  while (I >= 0) and (MyRo.EnemyCity[I].Loc <> Loc) do Dec(I);
+  if I >= 0 then Result := @MyRo.EnemyCity[I]
+    else Result := nil;
+end;
+
+function GetMyUnitByLoc(Loc: Integer): PUn;
+var
+  I: Integer;
+begin
+  I := MyRO.nUn - 1;
+  while (I >= 0) and (MyUn[I].Loc <> Loc) do Dec(I);
+  if I >= 0 then Result := @MyUn[I]
+    else Result := nil;
+end;
+
+function GetEnemyUnitByLoc(Loc: Integer): PUnitInfo;
+var
+  I: Integer;
+begin
+  I := MyRO.nEnemyUn - 1;
+  while (I >= 0) and (MyRO.EnemyUn[I].Loc <> Loc) do Dec(I);
+  if I >= 0 then Result := @MyRO.EnemyUn[I]
+    else Result := nil;
+end;
+
+
 initialization