Changeset 327 for trunk/LocalPlayer/IsoEngine.pas

Timestamp:

Mar 25, 2021, 2:09:42 PM (3 years ago)

Author:

chronos

Message:

• Modified: Use enumeration type for MapOptions and game options.

File:

• trunk/LocalPlayer/IsoEngine.pas (modified) (8 diffs)

trunk/LocalPlayer/IsoEngine.pas

@@ -66 +66 @@
   end;
 
-const
-  // options switched by buttons
-  moPolitical = 0;
-  moCityNames = 1;
-  moGreatWall = 4;
-  moGrid = 5;
-  moBareTerrain = 6;
-
-  // other options
-  moEditMode = 16;
-  moLocCodes = 17;
-
 var
   NoMap: TIsoMap;
-  Options: Integer;
+  MapOptions: TMapOptions;
   pDebugMap: Integer; // -1 for off
 
@@ -1004 +992 @@
   begin
     BehindCityInfo.Loc := Loc - 2 * G.lx;
-    if ShowCityNames and (Options and (1 shl moEditMode) = 0) and
+    if ShowCityNames and not (moEditMode in MapOptions) and
       (BehindCityInfo.Loc >= 0) and (BehindCityInfo.Loc < G.lx * G.ly) and
       (MyMap[BehindCityInfo.Loc] and fCity <> 0) then
@@ -1025 +1013 @@
   procedure ShowSpacePort;
   begin
-    if ShowObjects and (Options and (1 shl moEditMode) = 0) and
+    if ShowObjects and not (moEditMode in MapOptions) and
       (Tile and fCity <> 0) and (CityInfo.Flags and ciSpacePort <> 0) then
       TSprite(x + xxt, y - 6, spSpacePort);
@@ -1093 +1081 @@
   else
     Tile := MyMap[Loc];
-  if ShowObjects and (Options and (1 shl moEditMode) = 0) and
+  if ShowObjects and not (moEditMode in MapOptions) and
     (Tile and fCity <> 0) then
     GetCityInfo(Loc, cix, CityInfo);
@@ -1148 +1136 @@
     TSprite(x, y, spMinerals + (Tile shr 25 and 3) * TerrainIconCols);
 
-  if Options and (1 shl moEditMode) <> 0 then
+  if moEditMode in MapOptions then
     fog := (Loc < 0) or (Loc >= G.lx * G.ly)
     // else if CityLoc>=0 then
@@ -1182 +1170 @@
   end;
 {$ENDIF}
-  if Options and (1 shl moEditMode) <> 0 then
+  if moEditMode in MapOptions then
   begin
     if Tile and fPrefStartPos <> 0 then
@@ -1427 +1415 @@
 begin
   FoW := true;
-  ShowLoc := Options and (1 shl moLocCodes) <> 0;
+  ShowLoc := moLocCodes in MapOptions;
   ShowDebug := pDebugMap >= 0;
-  ShowObjects := (CityOwner >= 0) or (Options and (1 shl moBareTerrain) = 0);
+  ShowObjects := (CityOwner >= 0) or not (moBareTerrain in MapOptions);
   ShowCityNames := ShowObjects and (CityOwner < 0) and
-    (Options and (1 shl moCityNames) <> 0);
+    (moCityNames in MapOptions);
   ShowBorder := true;
   ShowMyBorder := CityOwner < 0;
-  ShowGrWall := (CityOwner < 0) and (Options and (1 shl moGreatWall) <> 0);
+  ShowGrWall := (CityOwner < 0) and (moGreatWall in MapOptions);
   if ShowDebug then
     Server(sGetDebugMap, me, pDebugMap, DebugMap)
@@ -1622 +1610 @@
   else
   begin
-    if ShowLoc or (Options and (1 shl moEditMode) <> 0) or
-      (Options and (1 shl moGrid) <> 0) then
+    if ShowLoc or (moEditMode in MapOptions) or
+      (moGrid in MapOptions) then
       PaintGrid(x, y, nx, ny);
     for dy := -2 to ny + 1 do