Changeset 356 for trunk/LocalPlayer/CityScreen.pas

Timestamp:

Apr 8, 2021, 9:57:38 PM (4 years ago)

Author:

chronos

Message:

• Modified: Made city small map mode enumeration type.

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (17 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -15 +15 @@
 type
   TCityCloseAction = (None, RestoreFocus, StepFocus);
+  TSmallMapMode = (smSupportedUnits, smImprovements);
 
   TCityDlg = class(TBufferedDrawDlg)
@@ -59 +60 @@
     cix: Integer;
     cLoc: Integer;
-    Mode: Integer;
+    SmallMapMode: TSmallMapMode;
     ZoomArea: Integer;
     Page: Integer;
@@ -111 +112 @@
 
 const
-  { modes }
-  mSupp = 1;
-  mImp = 2;
-
   wBar = 106;
   xDiv = 400;
@@ -205 +202 @@
   AreaMap.SetPaintBounds(xmArea - 192, ymArea - 96 - 32, xmArea + 192,
     ymArea + 96);
-  Mode := mImp;
+  SmallMapMode := smImprovements;
   ZoomArea := 1;
   ProdHint := false;
@@ -269 +266 @@
 procedure TCityDlg.Reset;
 begin
-  Mode := mImp;
+  SmallMapMode := smImprovements;
   ZoomArea := 1;
 end;
@@ -375 +372 @@
   BitBltCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas, xZoomMap, yZoomMap);
-  if Mode = mImp then begin
+  if SmallMapMode = smImprovements then begin
     if ZoomArea < 3 then begin
       ImageOp_B(ZoomCityMap, CityMapTemplate, 0, 0, 376 * SizeClass,
@@ -795 +792 @@
   BitBltCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
     SmallCityMap.Canvas, 0, 0);
-  if Mode = mImp then
+  if SmallMapMode = smImprovements then
     Frame(offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
       ySmallMap + 24 * (ZoomArea mod 3), xSmallMap + 48 * (ZoomArea div 3) + 49,
@@ -811 +808 @@
   x := xSupport + wSupport div 2;
   y := ySupport + hSupport div 2;
-  if Mode = mSupp then
+  if SmallMapMode = smSupportedUnits then
   begin
     offscreen.Canvas.brush.Color := MainTexture.ColorMark;
@@ -826 +823 @@
   for i := 0 to 5 do
     imix[i] := -1;
-  if Mode = mImp then
+  if SmallMapMode = smImprovements then
   begin
     if ZoomArea = 5 then
@@ -918 +915 @@
       Imp5Area.Hint := '';
   end
-  else { if mode=mSupp then }
+  else { if SmallMapMode=smSupportedUnits then }
   begin
     LoweredTextout(offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
@@ -1049 +1046 @@
   else { enemy city }
   begin
-    Mode := mImp;
+    SmallMapMode := smImprovements;
     Server(sGetCity, me, cLoc, GetCityData);
     c := GetCityData.c;
@@ -1147 +1144 @@
     (y >= ySmallMap) and (y < ySmallMap + hSmallMap) then
   begin
-    Mode := mImp;
+    SmallMapMode := smImprovements;
     ZoomArea := (y - ySmallMap) * 3 div hSmallMap + 3 *
       ((x - xSmallMap) * 2 div wSmallMap);
@@ -1158 +1155 @@
     (y >= ySupport) and (y < ySupport + hSupport) then
   begin
-    Mode := mSupp;
+    SmallMapMode := smSupportedUnits;
     Page := 0;
     InitZoomCityMap;
@@ -1190 +1187 @@
         ChooseProject;
       end
-    else if (Mode = mImp) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
+    else if (SmallMapMode = smImprovements) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
       (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
     begin
@@ -1204 +1201 @@
         if iix >= 0 then
           if ssShift in Shift then
-            HelpDlg.ShowNewContent(Mode or wmPersistent, hkImp, iix)
+            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, iix)
           else if (ClientMode < scContact) then
             with MessgExDlg do
@@ -1301 +1298 @@
       end;
     end
-    else if (Mode = mSupp) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
+    else if (SmallMapMode = smSupportedUnits) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
       (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
     begin
@@ -1336 +1333 @@
           Loc1 := dLoc(cLoc, dx, dy);
           if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) then
-            HelpOnTerrain(Loc1, Mode or wmPersistent)
+            HelpOnTerrain(Loc1, FWindowMode or wmPersistent)
         end
         else if (ClientMode < scContact) and (cGov <> gAnarchy) and