Changeset 327 for trunk

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• LocalPlayer/ClientTools.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (8 diffs)
• LocalPlayer/NatStat.pas (modified) (3 diffs)
• LocalPlayer/Term.pas (modified) (20 diffs)
• UMiniMap.pas (modified) (4 diffs)

trunk/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

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

trunk/LocalPlayer/NatStat.pas

@@ -141 +141 @@
   ScrollDownBtn.Visible := (CurrentReport.TurnOfCivilReport >= 0) and
     (ReportText.Count > ReportLines);
-  if OptionChecked and (1 shl soTellAI) <> 0 then
+  if soTellAI in OptionChecked then
     TellAIBtn.ButtonIndex := 3
   else
@@ -390 +390 @@
     end;
 
-    if OptionChecked and (1 shl soTellAI) <> 0 then
-    begin
+    if soTellAI in OptionChecked then begin
       Server(sGetAIInfo, me, pView, ps);
       LoweredTextOut(Canvas, -1, MainTexture, 42, 445, ps);
-    end
-    else
+    end else
       LoweredTextOut(Canvas, -2, MainTexture, 42, 445,
         Phrases2.Lookup('MENU_TELLAI'));
@@ -537 +535 @@
 procedure TNatStatDlg.TellAIBtnClick(Sender: TObject);
 begin
-  OptionChecked := OptionChecked xor (1 shl soTellAI);
-  if OptionChecked and (1 shl soTellAI) <> 0 then
+  if soTellAI in OptionChecked then OptionChecked := OptionChecked - [soTellAI]
+    else OptionChecked := OptionChecked + [soTellAI];
+  if soTellAI in OptionChecked then
     TellAIBtn.ButtonIndex := 3
   else

trunk/LocalPlayer/Term.pas

@@ -271 +271 @@
     procedure InitModule;
     procedure InitTurn(NewPlayer: integer);
+    procedure SaveMenuItemsState;
     procedure ScrollBarUpdate(Sender: TObject);
     procedure ArrangeMidPanel;
@@ -421 +422 @@
   // lines of system icons in icons.bmp before improvements
 
-  // save options apart from what's defined by SaveOption
-  soTellAI = 30;
-  soExtraMask = $40000000;
-
   nCityEventPriority = 16;
   CityEventPriority: array [0 .. nCityEventPriority - 1] of integer =
@@ -485 +482 @@
   Age: Integer;
   UnFocus: Integer;
-  OptionChecked: Integer;
-  MapOptionChecked: Integer;
+  OptionChecked: TSaveOptions;
+  MapOptionChecked: TMapOptions;
   nLostArmy: Integer;
   ScienceSum: Integer;
@@ -570 +567 @@
   flImmUpdate = $0002;
 
-  nSaveOption = 22;
-
 var
   Jump: array [0 .. nPl - 1] of integer;
@@ -577 +572 @@
   SmallScreen, GameOK, MapValid, skipped, idle: boolean;
 
-  SaveOption: array [0..nSaveOption - 1] of integer;
+  SaveOption: array of integer;
   MiniColors: array [0..11, 0..1] of TColor;
   MainMap: TIsoMap;
@@ -1266 +1261 @@
 procedure TMainScreen.SetMapOptions;
 begin
-  MiniMap.Options := MapOptionChecked;
-  IsoEngine.Options := MapOptionChecked;
+  MiniMap.MapOptions := MapOptionChecked;
+  IsoEngine.MapOptions := MapOptionChecked;
   if ClientMode = cEditMap then
-    IsoEngine.Options := IsoEngine.Options or (1 shl moEditMode);
+    IsoEngine.MapOptions := IsoEngine.MapOptions + [moEditMode];
   if mLocCodes.Checked then
-    IsoEngine.Options := IsoEngine.Options or (1 shl moLocCodes);
+    IsoEngine.MapOptions := IsoEngine.MapOptions + [moLocCodes];
 end;
 
@@ -3458 +3453 @@
   BaseWin.CreateOffscreen(Offscreen);
 
-   // define which menu settings to save
+  // define which menu settings to save
+  SetLength(SaveOption, 22);
   SaveOption[0] := mAlEffectiveMovesOnly.Tag;
   SaveOption[1] := mEnMoves.Tag;
@@ -3490 +3486 @@
   for i := 0 to ComponentCount - 1 do
     if Components[i].Tag and $FF <> 0 then
-      if Components[i] is TMenuItem then
-      begin
+      if Components[i] is TMenuItem then begin
         TMenuItem(Components[i]).Caption := Phrases.Lookup('CONTROLS',
           -1 + Components[i].Tag and $FF);
-        for j := 0 to nSaveOption - 1 do
+        for j := 0 to Length(SaveOption) - 1 do
           if Components[i].Tag and $FF = SaveOption[j] then
-            TMenuItem(Components[i]).Checked := ((1 shl j) and OptionChecked) <> 0;
-      end
-      else if Components[i] is TButtonBase then
-      begin
+            TMenuItem(Components[i]).Checked := TSaveOption(j) in OptionChecked;
+      end else
+      if Components[i] is TButtonBase then begin
         TButtonBase(Components[i]).Hint := Phrases.Lookup('CONTROLS',
           -1 + Components[i].Tag and $FF);
@@ -3505 +3499 @@
           (TButtonC(Components[i]).ButtonIndex <> 1) then
           TButtonC(Components[i]).ButtonIndex :=
-            MapOptionChecked shr (Components[i].Tag shr 8) and 1 + 2
+            Integer(MapOptionChecked) shr (Components[i].Tag shr 8) and 1 + 2
       end;
 
@@ -5015 +5009 @@
 procedure TMainScreen.Timer1Timer(Sender: TObject);
 var
-  dx, dy, speed: integer;
+  dx, dy, ScrollSpeed: integer;
 begin
   if idle and (me >= 0) and (GameMode <> cMovie) then
@@ -5036 +5030 @@
       if Application.Active and not mScrollOff.Checked then
       begin
-        if mScrollFast.Checked then
-          speed := 2
-        else
-          speed := 1;
+        if mScrollFast.Checked then ScrollSpeed := 2
+          else ScrollSpeed := 1;
         dx := 0;
         dy := 0;
         if Mouse.CursorPos.y < Screen.height - PanelHeight then
           if Mouse.CursorPos.x = 0 then
-            dx := -speed // scroll left
+            dx := -ScrollSpeed // scroll left
           else if Mouse.CursorPos.x = Screen.width - 1 then
-            dx := speed; // scroll right
+            dx := ScrollSpeed; // scroll right
         if Mouse.CursorPos.y = 0 then
-          dy := -speed // scroll up
+          dy := -ScrollSpeed // scroll up
         else if (Mouse.CursorPos.y = Screen.height - 1) and
           (Mouse.CursorPos.x >= TerrainBtn.Left + TerrainBtn.width) and
           (Mouse.CursorPos.x < xRightPanel + 10 - 8) then
-          dy := speed; // scroll down
+          dy := ScrollSpeed; // scroll down
         if (dx <> 0) or (dy <> 0) then
         begin
@@ -6382 +6374 @@
 begin
   IsoEngine.pDebugMap := p;
-  IsoEngine.Options := IsoEngine.Options and not(1 shl moLocCodes);
+  IsoEngine.MapOptions := IsoEngine.MapOptions - [moLocCodes];
   mLocCodes.Checked := false;
   MapValid := false;
@@ -7706 +7698 @@
 var
   Reg: TRegistry;
-  DefaultOptionChecked: Integer;
-begin
-  DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
-    1 shl 18 + 1 shl 19;
+  DefaultOptionChecked: TSaveOptions;
+begin
+  DefaultOptionChecked := [soEnMoves, soSlowMoves, soNames, soRepScreens,
+    soSoundOn, soScrollOff, soAlSlowMoves];
   Reg := TRegistry.Create;
   with Reg do try
@@ -7717 +7709 @@
     xxt := TileSizes[TileSize].X;
     yyt := TileSizes[TileSize].Y;
-    if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
+    if ValueExists('OptionChecked') then OptionChecked := TSaveOptions(ReadInteger('OptionChecked'))
       else OptionChecked := DefaultOptionChecked;
-    if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
-      else MapOptionChecked := 1 shl moCityNames;
+    if ValueExists('MapOptionChecked') then MapOptionChecked := TMapOptions(ReadInteger('MapOptionChecked'))
+      else MapOptionChecked := [moCityNames];
     if ValueExists('CityReport') then CityRepMask := Cardinal(ReadInteger('CityReport'))
       else CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
           not chCaptured);
-    if OptionChecked and (7 shl 16) = 0 then
-      OptionChecked := OptionChecked or (1 shl 16);
+    if (not (soScrollFast in OptionChecked)) and (not (soScrollSlow in OptionChecked)) and
+      (not (soScrollOff in OptionChecked)) then
+      OptionChecked := OptionChecked + [soScrollSlow];
       // old regver with no scrolling
   finally
@@ -7731 +7724 @@
   end;
 
-  if 1 shl 13 and OptionChecked <> 0 then
+  if soSoundOff in OptionChecked  then
     SoundMode := smOff
-  else if 1 shl 15 and OptionChecked <> 0 then
+  else if soSoundOnAlt in OptionChecked then
     SoundMode := smOnAlt
   else
@@ -7803 +7796 @@
   with TButtonC(Sender) do
   begin
-    MapOptionChecked := MapOptionChecked xor (1 shl (Tag shr 8));
+    MapOptionChecked := TMapOptions(Integer(MapOptionChecked) xor (1 shl (Tag shr 8)));
     SetMapOptions;
-    ButtonIndex := MapOptionChecked shr (Tag shr 8) and 1 + 2;
+    ButtonIndex := Integer(MapOptionChecked) shr (Tag shr 8) and 1 + 2;
   end;
   if Sender = MapBtn0 then
@@ -7823 +7816 @@
   if TButtonBase(Sender).Down then
   begin
-    MapOptionChecked := MapOptionChecked or (1 shl moGreatWall);
+    MapOptionChecked := MapOptionChecked + [moGreatWall];
     TButtonBase(Sender).Hint := '';
   end
   else
   begin
-    MapOptionChecked := MapOptionChecked and not(1 shl moGreatWall);
+    MapOptionChecked := MapOptionChecked - [moGreatWall];
     TButtonBase(Sender).Hint := Phrases.Lookup('CONTROLS',
       -1 + TButtonBase(Sender).Tag and $FF);
@@ -7841 +7834 @@
   if TButtonBase(Sender).Down then
   begin
-    MapOptionChecked := MapOptionChecked or (1 shl moBareTerrain);
+    MapOptionChecked := MapOptionChecked + [moBareTerrain];
     TButtonBase(Sender).Hint := '';
   end
   else
   begin
-    MapOptionChecked := MapOptionChecked and not(1 shl moBareTerrain);
+    MapOptionChecked := MapOptionChecked - [moBareTerrain];
     TButtonBase(Sender).Hint := Phrases.Lookup('CONTROLS',
       -1 + TButtonBase(Sender).Tag and $FF);
@@ -7973 +7966 @@
 end;
 
+procedure TMainScreen.SaveMenuItemsState;
+var
+  i, j: integer;
+begin
+  if soTellAI in OptionChecked then OptionChecked := [soTellAI]
+    else OptionChecked := [];
+  for i := 0 to ComponentCount - 1 do
+    if Components[i] is TMenuItem then
+      for j := 0 to Length(SaveOption) - 1 do
+        if TMenuItem(Components[i]).Checked and
+          (TMenuItem(Components[i]).Tag = SaveOption[j]) then
+          OptionChecked := OptionChecked + [TSaveOption(j)];
+end;
+
 procedure TMainScreen.SaveSettings;
 var
-  i, j: integer;
   Reg: TRegistry;
 begin
-  OptionChecked := OptionChecked and soExtraMask;
-  for i := 0 to ComponentCount - 1 do
-    if Components[i] is TMenuItem then
-      for j := 0 to nSaveOption - 1 do
-        if TMenuItem(Components[i]).Checked and
-          (TMenuItem(Components[i]).Tag = SaveOption[j]) then
-          inc(OptionChecked, 1 shl j);
+  SaveMenuItemsState;
 
   Reg := TRegistry.Create;
@@ -7991 +7991 @@
     OpenKey(AppRegistryKey, true);
     WriteInteger('TileSize', Integer(TileSize));
-    WriteInteger('OptionChecked', OptionChecked);
-    WriteInteger('MapOptionChecked', MapOptionChecked);
+    WriteInteger('OptionChecked', Integer(OptionChecked));
+    WriteInteger('MapOptionChecked', Integer(MapOptionChecked));
     WriteInteger('CityReport', integer(CityRepMask));
   finally

trunk/UMiniMap.pas

@@ -5 +5 @@
 
 uses
-  Classes, SysUtils, Graphics, Protocol;
+  Classes, SysUtils, Graphics, Protocol, ClientTools;
 
 type
@@ -22 +22 @@
     Colors: array [0 .. 11, 0 .. 1] of TColor;
     Mode: TMiniMode;
-    Options: Integer;
+    MapOptions: TMapOptions;
     procedure LoadFromLogFile(FileName: string; var LastTurn: Integer; DefaultSize: TPoint);
     procedure LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
@@ -37 +37 @@
 
 uses
-  ScreenTools, UPixelPointer, Global, GameServer, IsoEngine, Tribes, ClientTools;
+  ScreenTools, UPixelPointer, Global, GameServer, IsoEngine, Tribes;
 
 const
@@ -310 +310 @@
             cm := $808080 or cm shr 1; { increase brightness }
           end
-          else if Options and (1 shl moPolitical) <> 0 then begin
+          else if moPolitical in MapOptions then begin
             // Political
             if MyMap[Loc] and fTerrain < fGrass then