Game: Use proper syntax of sets for game options instead of raw bitwise operations

[d2df-sdl.git] / src / game / g_options.pas

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 93e9199a211d2f4c40a03531898b8f49667f734b..79da12ec4439c1e57f490e504481e15ce2bf730a 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -18,7 +18,7 @@ unit g_options;
 interface
 
 uses
-  g_language, g_weapons, utils;
+  g_language, g_game, g_weapons, utils;
 
 function GenPlayerName (n: Integer): String;
 
@@ -71,12 +71,12 @@ var
   gsScoreLimit: Word;
   gsMaxLives: Byte;
   gsPlayers: Byte;
-  gsGameFlags: LongWord;
+  gsGameFlags: TGameOptions;
   gsSpawnInvul: Integer = 0;
   gsItemRespawnTime: Word = 60;
   gsItemRespawnRandom: Word = 0;
-  gsRulezRespawnTime: Word = 60;
-  gsRulezRespawnRandom: Word = 0;
+  gsPowerupRespawnTime: Word = 60;
+  gsPowerupRespawnRandom: Word = 0;
   gsWarmupTime: Word = 30;
 
 implementation
@@ -87,7 +87,7 @@ uses
     SDL2,
   {$ENDIF}
   e_log, e_input, g_console, g_window, g_sound, g_gfx, g_player, Math,
-  g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main, e_texture,
+  g_map, g_net, g_netmaster, SysUtils, CONFIG, g_main, e_texture,
   g_items, wadreader, e_graphics, g_touch, envvars, g_system;
 
   var
@@ -100,7 +100,7 @@ uses
     if Result = '' then
       Result := 'Player' + IntToStr(machine MOD 10000);
     if n = 1 then
-      Result := Copy(Result, 1, 12) + ' '
+      Result := Copy(Result, 1, 12)
     else
       Result := Copy(Result, 1, 10) + ' ' + IntToStr(n)
   end;
@@ -271,12 +271,11 @@ begin
   gsSpawnInvul := 0;
   gsItemRespawnTime := 60;
   gsItemRespawnRandom := 0;
-  gsRulezRespawnTime := 60;
-  gsRulezRespawnRandom := 0;
-  gsGameFlags := GAME_OPTION_ALLOWEXIT or GAME_OPTION_DMKEYS or
-    GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER or
-    GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE or
-    GAME_OPTION_ALLOWDROPFLAG;
+  gsPowerupRespawnTime := 60;
+  gsPowerupRespawnRandom := 0;
+  gsGameFlags := [TGameOption.ALLOW_EXIT, TGameOption.DM_KEYS, TGameOption.BOTS_VS_PLAYERS,
+    TGameOption.BOTS_VS_MONSTERS, TGameOption.TEAM_HIT_TRACE, TGameOption.TEAM_HIT_PROJECTILE,
+    TGameOption.ALLOW_DROP_FLAG];
   gsPlayers := 1;
 
   if not gGameOn then
@@ -322,8 +321,8 @@ begin
     SpawnInvul := gsSpawnInvul;
     ItemRespawnTime := gsItemRespawnTime;
     ItemRespawnRandom := gsItemRespawnRandom;
-    RulezRespawnTime := gsRulezRespawnTime;
-    RulezRespawnRandom := gsRulezRespawnRandom;
+    PowerupRespawnTime := gsPowerupRespawnTime;
+    PowerupRespawnRandom := gsPowerupRespawnRandom;
     WarmupTime := gsWarmupTime;
     Options := gsGameFlags;
   end;