X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_menu.pas;h=bd213148c20374d88faf9ef963fd0605124eac46;hb=a9b641b6421fe1ab2ae3ffdf6a7fb41c56df1970;hp=8331660c6107c21c00137101818cc3ce0aa28a37;hpb=6f5375e6179294fde838bcf61f0dafeb4e018ee7;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 8331660..bd21314 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -38,6 +38,7 @@ var
   PromptIP: string;
   PromptPort: Word;
   TempScale: Integer = -1;
+  TempResScale: Integer = -1;
 
 implementation
 
@@ -108,7 +109,6 @@ var
   menu: TGUIMenu;
   i: Integer;
   ovs: Boolean;
-  s: AnsiString;
 begin
   menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
 
@@ -124,6 +124,7 @@ begin
 
   gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
   glNPOTOverride := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
+  gLerpActors := TGUISwitch(menu.GetControl('swInterp')).ItemIndex = 0;
 
   menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
 
@@ -375,9 +376,6 @@ begin
 
   if g_Game_IsClient then MC_SEND_PlayerSettings;
 
-  s := e_GetWriteableDir(ConfigDirs);
-  if s <> '' then
-    g_Options_Write(s + '/' + CONFIG_FILENAME);
   g_Console_WriteGameConfig;
 end;
 
@@ -403,6 +401,9 @@ begin
   with TGUISwitch(menu.GetControl('swLegacyNPOT')) do
     if not glNPOTOverride then ItemIndex := 0 else ItemIndex := 1;
 
+  with TGUISwitch(menu.GetControl('swInterp')) do
+    if gLerpActors then ItemIndex := 0 else ItemIndex := 1;
+
   menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
 
   TGUIScroll(menu.GetControl('scSoundLevel')).Value := Round(gSoundLevel/16);
@@ -645,14 +646,13 @@ begin
     }
 end;
 
-procedure ProcStartCustomGame();
+function LatchGameOptions(const MenuName: string): Byte;
 var
-  Map: String;
-  GameMode: Byte;
-  Options: LongWord;
-  s: AnsiString;
+  Map: string;
 begin
-  with TGUIMenu(g_ActiveWindow.GetControl('mCustomGameMenu')) do
+  Result := GM_NONE;
+
+  with TGUIMenu(g_ActiveWindow.GetControl(MenuName)) do
   begin
     Map := TGUILabel(GetControl('lbMap')).Text;
     if Map = '' then
@@ -660,113 +660,69 @@ begin
     if not isWadPath(Map) then
       Exit;
 
-    GameMode := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
-    gcGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
-    gcTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
-    gcGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
-    gcMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
-
-    gcTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
-    gcRespawnItems := TGUISwitch(GetControl('swRespawnItems')).ItemIndex = 0;
-    gcAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
-    gcWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
-    gcMonsters := TGUISwitch(GetControl('swMonsters')).ItemIndex = 0;
-    Options := 0;
-    if gcTeamDamage then
-      Options := Options or GAME_OPTION_TEAMDAMAGE;
-    if gcRespawnItems then
-      Options := Options or GAME_OPTION_RESPAWNITEMS;
-    if gcAllowExit then
-      Options := Options or GAME_OPTION_ALLOWEXIT;
-    if gcWeaponStay then
-      Options := Options or GAME_OPTION_WEAPONSTAY;
-    if gcMonsters then
-      Options := Options or GAME_OPTION_MONSTERS;
-    gcPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
+    Result := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
+    gsGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
+    gsTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
+    gsGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
+    gsMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
+    gsItemRespawnTime := StrToIntDef(TGUIEdit(GetControl('edItemRespawnTime')).Text, 0);
+    gsPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
+    gsMap := Map;
+
+    gsGameFlags := 0;
+    if TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0 then
+      gsGameFlags := gsGameFlags or GAME_OPTION_TEAMDAMAGE;
+    if TGUISwitch(GetControl('swDeathmatchKeys')).ItemIndex = 0 then
+      gsGameFlags := gsGameFlags or GAME_OPTION_DMKEYS;
+    if TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0 then
+      gsGameFlags := gsGameFlags or GAME_OPTION_ALLOWEXIT;
+    if TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0 then
+      gsGameFlags := gsGameFlags or GAME_OPTION_WEAPONSTAY;
+    if TGUISwitch(GetControl('swMonsters')).ItemIndex = 0 then
+      gsGameFlags := gsGameFlags or GAME_OPTION_MONSTERS;
+
+    case TGUISwitch(GetControl('swTeamHit')).ItemIndex of
+      1: gsGameFlags := gsGameFlags or GAME_OPTION_TEAMHITTRACE;
+      2: gsGameFlags := gsGameFlags or GAME_OPTION_TEAMHITPROJECTILE;
+      0: gsGameFlags := gsGameFlags or GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
+    end;
 
     case TGUISwitch(GetControl('swBotsVS')).ItemIndex of
-      1: begin
-        Options := Options or GAME_OPTION_BOTVSMONSTER;
-        gcBotsVS := 'Monsters';
-      end;
-      2: begin
-        Options := Options or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
-        gcBotsVS := 'Everybody';
-      end;
-      else begin
-        Options := Options or GAME_OPTION_BOTVSPLAYER;
-        gcBotsVS := 'Players';
-      end;
+      1: gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSMONSTER;
+      2: gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
+      else gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER;
     end;
 
-    gcMap := Map;
+    // TODO: get this crap out of here
+    gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+    gGameSettings.WarmupTime := gsWarmupTime;
+    gGameSettings.SpawnInvul := gsSpawnInvul;
   end;
+end;
 
-  s := e_GetWriteableDir(ConfigDirs);
-  if s <> '' then
-    g_Options_Write_Gameplay_Custom(s + '/' + CONFIG_FILENAME);
+procedure ProcStartCustomGame();
+var
+  GameMode: Byte;
+begin
+  GameMode := LatchGameOptions('mCustomGameMenu');
+  if GameMode = GM_NONE then Exit;
 
-  g_Game_StartCustom(Map, GameMode, gcTimeLimit, gcGoalLimit,
-                     gcMaxLives, Options, gcPlayers);
+  g_Console_WriteGameConfig;
+  g_Game_StartCustom(gsMap, GameMode, gsTimeLimit, gsGoalLimit,
+                     gsMaxLives, gsGameFlags, gsPlayers);
 end;
 
 
 procedure ProcStartNetGame();
 var
-  Map: String;
   GameMode: Byte;
-  Options: LongWord;
-  s: AnsiString;
 begin
+  GameMode := LatchGameOptions('mNetServerMenu');
+  if GameMode = GM_NONE then Exit;
+
   with TGUIMenu(g_ActiveWindow.GetControl('mNetServerMenu')) do
   begin
-    Map := TGUILabel(GetControl('lbMap')).Text;
-    if Map = '' then
-      Exit;
-    if not isWadPath(Map) then
-      Exit;
-
-    GameMode := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
-    gnGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
-    gnTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
-    gnGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
-    gnMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
     NetPort := StrToIntDef(TGUIEdit(GetControl('edPort')).Text, 0);
-
-    gnTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
-    gnRespawnItems := TGUISwitch(GetControl('swRespawnItems')).ItemIndex = 0;
-    gnAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
-    gnWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
-    gnMonsters := TGUISwitch(GetControl('swMonsters')).ItemIndex = 0;
-    Options := 0;
-    if gnTeamDamage then
-      Options := Options or GAME_OPTION_TEAMDAMAGE;
-    if gnRespawnItems then
-      Options := Options or GAME_OPTION_RESPAWNITEMS;
-    if gnAllowExit then
-      Options := Options or GAME_OPTION_ALLOWEXIT;
-    if gnWeaponStay then
-      Options := Options or GAME_OPTION_WEAPONSTAY;
-    if gnMonsters then
-      Options := Options or GAME_OPTION_MONSTERS;
-    gnPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
-
-    case TGUISwitch(GetControl('swBotsVS')).ItemIndex of
-      1: begin
-        Options := Options or GAME_OPTION_BOTVSMONSTER;
-        gnBotsVS := 'Monsters';
-      end;
-      2: begin
-        Options := Options or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
-        gnBotsVS := 'Everybody';
-      end;
-      else begin
-        Options := Options or GAME_OPTION_BOTVSPLAYER;
-        gnBotsVS := 'Players';
-      end;
-    end;
-
-    gnMap := Map;
     NetServerName := TGUIEdit(GetControl('edSrvName')).Text;
     NetMaxClients := Max(1, StrToIntDef(TGUIEdit(GetControl('edMaxPlayers')).Text, 1));
     NetMaxClients := Min(NET_MAXCLIENTS, NetMaxClients);
@@ -774,21 +730,14 @@ begin
     NetUseMaster := TGUISwitch(GetControl('swUseMaster')).ItemIndex = 0;
   end;
 
-  s := e_GetWriteableDir(ConfigDirs);
-  if s <> '' then
-  begin
-    g_Options_Write_Net_Server(s + '/' + CONFIG_FILENAME);
-    g_Options_Write_Gameplay_Net(s + '/' + CONFIG_FILENAME)
-  end;
-
-  g_Game_StartServer(Map, GameMode, gnTimeLimit, gnGoalLimit, gnMaxLives,
-                     Options, gnPlayers, 0, NetPort);
+  g_Console_WriteGameConfig;
+  g_Game_StartServer(gsMap, GameMode, gsTimeLimit, gsGoalLimit, gsMaxLives,
+                     gsGameFlags, gsPlayers, 0, NetPort);
 end;
 
 procedure ProcConnectNetGame();
 var
   PW: String;
-  s: AnsiString;
 begin
   with TGUIMenu(g_ActiveWindow.GetControl('mNetClientMenu')) do
   begin
@@ -797,16 +746,13 @@ begin
     PW := TGUIEdit(GetControl('edPW')).Text;
   end;
 
-  s := e_GetWriteableDir(ConfigDirs);
-  if s <> '' then
-    g_Options_Write_Net_Client(s + '/' + CONFIG_FILENAME);
+  g_Console_WriteGameConfig;
   g_Game_StartClient(NetClientIP, NetClientPort, PW);
 end;
 
 procedure ProcEnterPassword();
 var
   PW: string;
-  s: AnsiString;
 begin
   with TGUIMenu(g_ActiveWindow.GetControl('mClientPasswordMenu')) do
   begin
@@ -815,9 +761,7 @@ begin
     PW := TGUIEdit(GetControl('edPW')).Text;
   end;
 
-  s := e_GetWriteableDir(ConfigDirs);
-  if s <> '' then
-    g_Options_Write_Net_Client(s + '/' + CONFIG_FILENAME);
+  g_Console_WriteGameConfig;
   g_Game_StartClient(NetClientIP, NetClientPort, PW);
 end;
 
@@ -834,7 +778,7 @@ begin
       NetInitDone := True;
   end;
 
-  g_Net_Slist_Set(NetSlistIP, NetSlistPort, NetSlistList);
+  g_Net_Slist_Set(NetMasterList);
 
   gState := STATE_SLIST;
   g_ActiveWindow := nil;
@@ -1697,6 +1641,20 @@ begin
         ItemIndex := 0
       else
         ItemIndex := 1;
+    with TGUISwitch(menu.GetControl('swTeamHit')) do
+      if (Options and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE)) = (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE) then
+        ItemIndex := 0
+      else if LongBool(Options and GAME_OPTION_TEAMHITTRACE) then
+        ItemIndex := 1
+      else if LongBool(Options and GAME_OPTION_TEAMHITPROJECTILE) then
+        ItemIndex := 2
+      else
+        ItemIndex := 3;
+    with TGUISwitch(menu.GetControl('swDeathmatchKeys')) do
+      if LongBool(Options and GAME_OPTION_DMKEYS) then
+        ItemIndex := 0
+      else
+        ItemIndex := 1;
 
     TGUIEdit(menu.GetControl('edTimeLimit')).Text := IntToStr(TimeLimit);
     TGUIEdit(menu.GetControl('edGoalLimit')).Text := IntToStr(GoalLimit);
@@ -1715,6 +1673,17 @@ begin
     if GameType in [GT_CUSTOM, GT_SERVER] then
       begin
         TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
+        TGUISwitch(menu.GetControl('swTeamHit')).Enabled := True;
+        if (GameMode in [GM_DM, GM_TDM, GM_CTF]) then
+        begin
+          TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := True;
+          TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_ITEMSTEXT_COLOR;
+        end
+        else
+        begin
+          TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := False;
+          TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_UNACTIVEITEMS_COLOR;
+        end;
         TGUIEdit(menu.GetControl('edTimeLimit')).Enabled := True;
         TGUILabel(menu.GetControlsText('edTimeLimit')).Color := MENU_ITEMSTEXT_COLOR;
         TGUIEdit(menu.GetControl('edGoalLimit')).Enabled := True;
@@ -1726,6 +1695,9 @@ begin
     else
       begin
         TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
+        TGUISwitch(menu.GetControl('swTeamHit')).Enabled := True;
+        TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := False;
+        TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_UNACTIVEITEMS_COLOR;
         with TGUIEdit(menu.GetControl('edTimeLimit')) do
         begin
           Enabled := False;
@@ -1769,6 +1741,24 @@ begin
         Options := Options and (not GAME_OPTION_TEAMDAMAGE);
     end;
 
+    if TGUISwitch(menu.GetControl('swTeamHit')).Enabled then
+    begin
+      Options := Options and not (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE);
+      case TGUISwitch(menu.GetControl('swTeamHit')).ItemIndex of
+        1: Options := Options or GAME_OPTION_TEAMHITTRACE;
+        2: Options := Options or GAME_OPTION_TEAMHITPROJECTILE;
+        0: Options := Options or GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
+      end;
+    end;
+
+    if TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled then
+    begin
+      if TGUISwitch(menu.GetControl('swDeathmatchKeys')).ItemIndex = 0 then
+        Options := Options or GAME_OPTION_DMKEYS
+      else
+        Options := Options and (not GAME_OPTION_DMKEYS);
+    end;
+
     if TGUIEdit(menu.GetControl('edTimeLimit')).Enabled then
     begin
       n := StrToIntDef(TGUIEdit(menu.GetControl('edTimeLimit')).Text, TimeLimit);
@@ -1847,6 +1837,12 @@ begin
           end;
       end;
     end;
+
+    // don't forget to latch this shit
+    gsGameFlags := Options;
+    gsMaxLives := MaxLives;
+    gsGoalLimit := GoalLimit;
+    gsTimeLimit := TimeLimit;
   end;
 
   if g_Game_IsNet then MH_SEND_GameSettings;
@@ -1860,8 +1856,8 @@ begin
   menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
 
   TGUILabel(menu.GetControl('lbCurrentRes')).Text :=
-    IntToStr(gScreenWidth) +
-    ' x ' + IntToStr(gScreenHeight) +
+    IntToStr(gWinSizeX) +
+    ' x ' + IntToStr(gWinSizeY) +
     ', ' + IntToStr(gBPP) + ' bpp';
 
   with TGUIListBox(menu.GetControl('lsResolution')) do
@@ -1883,6 +1879,10 @@ begin
       ItemIndex := 0
     else
       ItemIndex := 1;
+
+  TempResScale := Round(r_pixel_scale - 1);
+  with TGUISwitch(menu.GetControl('swResFactor')) do
+    ItemIndex := Min(TempResScale, gRC_Width div 640 - 1);
 end;
 
 procedure ProcApplyVideoOptions();
@@ -1890,18 +1890,35 @@ var
   menu: TGUIMenu;
   Fullscreen: Boolean;
   SWidth, SHeight: Integer;
+  ScaleChanged: Boolean;
   str: String;
 begin
   menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
 
   str := TGUIListBox(menu.GetControl('lsResolution')).SelectedItem;
-  SScanf(str, '%dx%d', [@SWidth, @SHeight]);
+  if str <> '' then
+    SScanf(str, '%dx%d', [@SWidth, @SHeight])
+  else
+  begin
+    SWidth := gWinSizeX;
+    SHeight := gWinSizeY;
+    TempResScale := Min(TempResScale, SWidth div 640 - 1);
+  end;
 
   Fullscreen := TGUISwitch(menu.GetControl('swFullScreen')).ItemIndex = 0;
 
-  if (SWidth <> gScreenWidth) or
-     (SHeight <> gScreenHeight) or
-     (Fullscreen <> gFullscreen) then
+  ScaleChanged := False;
+  if TGUISwitch(menu.GetControl('swResFactor')).ItemIndex <> TempResScale then
+  begin
+    TempResScale := Min(TGUISwitch(menu.GetControl('swResFactor')).ItemIndex, SWidth div 640 - 1);
+    r_pixel_scale := TempResScale + 1;
+    ScaleChanged := True;
+  end;
+
+  if (SWidth <> gWinSizeX) or
+     (SHeight <> gWinSizeY) or
+     (Fullscreen <> gFullscreen) or
+     ScaleChanged then
   begin
     gResolutionChange := True;
     gRC_Width := SWidth;
@@ -2129,7 +2146,7 @@ begin
     begin
       Name := 'lbMap';
       FixedLength := 16;
-      Text := gnMap;
+      Text := gsMap;
       OnClick := @ProcSelectMapMenu;
     end;
     with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
@@ -2139,7 +2156,7 @@ begin
       AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
       AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
       AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
-      case g_Game_TextToMode(gnGameMode) of
+      case g_Game_TextToMode(gsGameMode) of
         GM_NONE,
         GM_DM:   ItemIndex := 0;
         GM_TDM:  ItemIndex := 1;
@@ -2147,7 +2164,7 @@ begin
         GM_SINGLE,
         GM_COOP: ItemIndex := 3;
       end;
-      OnChange := ProcSwitchMonstersNet;
+      OnChange := ProcSwitchMonstersCustom;
     end;
     with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
     begin
@@ -2155,8 +2172,8 @@ begin
       OnlyDigits := True;
       Width := 4;
       MaxLength := 5;
-      if gnTimeLimit > 0 then
-        Text := IntToStr(gnTimeLimit);
+      if gsTimeLimit > 0 then
+        Text := IntToStr(gsTimeLimit);
     end;
     with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
     begin
@@ -2164,42 +2181,67 @@ begin
       OnlyDigits := True;
       Width := 4;
       MaxLength := 5;
-      if gnGoalLimit > 0 then
-        Text := IntToStr(gnGoalLimit);
+      if gsGoalLimit > 0 then
+        Text := IntToStr(gsGoalLimit);
     end;
     with AddEdit(_lc[I_MENU_MAX_LIVES]) do
     begin
       Name := 'edMaxLives';
       OnlyDigits := True;
       Width := 4;
-      MaxLength := 3;
-      if gnMaxLives > 0 then
-        Text := IntToStr(gnMaxLives);
+      MaxLength := 5;
+      if gsMaxLives > 0 then
+        Text := IntToStr(gsMaxLives);
+    end;
+    with AddEdit(_lc[I_MENU_ITEM_RESPAWN_TIME]) do
+    begin
+      Name := 'edItemRespawnTime';
+      OnlyDigits := True;
+      Width := 4;
+      MaxLength := 5;
+      if gsItemRespawnTime > 0 then
+        Text := IntToStr(gsItemRespawnTime);
     end;
-    with AddSwitch(_lc[I_MENU_SERVER_PLAYERS]) do
+    with AddSwitch(_lc[I_MENU_PLAYERS]) do
     begin
       Name := 'swPlayers';
       AddItem(_lc[I_MENU_COUNT_NONE]);
       AddItem(_lc[I_MENU_PLAYERS_ONE]);
       AddItem(_lc[I_MENU_PLAYERS_TWO]);
-      ItemIndex := gnPlayers;
+      ItemIndex := gsPlayers;
     end;
     with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
     begin
       Name := 'swTeamDamage';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gnTeamDamage then
+      if LongBool(gsGameFlags and GAME_OPTION_TEAMDAMAGE) then
         ItemIndex := 0
       else
         ItemIndex := 1;
     end;
-    with AddSwitch(_lc[I_MENU_RESPAWN_ITEMS]) do
+    with AddSwitch(_lc[I_MENU_TEAM_HIT]) do
+    begin
+      Name := 'swTeamHit';
+      AddItem(_lc[I_MENU_TEAM_HIT_BOTH]);
+      AddItem(_lc[I_MENU_TEAM_HIT_TRACE]);
+      AddItem(_lc[I_MENU_TEAM_HIT_PROJECTILE]);
+      AddItem(_lc[I_MENU_TEAM_HIT_NOTHING]);
+      if (gsGameFlags and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE)) = (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE) then
+        ItemIndex := 0
+      else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITTRACE) then
+        ItemIndex := 1
+      else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITPROJECTILE) then
+        ItemIndex := 2
+      else
+        ItemIndex := 3;
+    end;
+    with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
     begin
-      Name := 'swRespawnItems';
+      Name := 'swDeathmatchKeys';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gnRespawnItems then
+      if LongBool(gsGameFlags and GAME_OPTION_DMKEYS) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2209,7 +2251,7 @@ begin
       Name := 'swEnableExits';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gnAllowExit then
+      if LongBool(gsGameFlags and GAME_OPTION_ALLOWEXIT) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2219,7 +2261,7 @@ begin
       Name := 'swWeaponStay';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gnWeaponStay then
+      if LongBool(gsGameFlags and GAME_OPTION_WEAPONSTAY) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2229,7 +2271,7 @@ begin
       Name := 'swMonsters';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gnMonsters then
+      if LongBool(gsGameFlags and GAME_OPTION_MONSTERS) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2241,9 +2283,9 @@ begin
       AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
       AddItem(_lc[I_MENU_BOTS_VS_ALL]);
       ItemIndex := 2;
-      if gnBotsVS = 'Players' then
+      if not LongBool(gsGameFlags and GAME_OPTION_BOTVSMONSTER) then
         ItemIndex := 0;
-      if gnBotsVS = 'Monsters' then
+      if not LongBool(gsGameFlags and GAME_OPTION_BOTVSPLAYER) then
         ItemIndex := 1;
     end;
     AddSpace();
@@ -2339,7 +2381,7 @@ begin
     begin
       Name := 'lbMap';
       FixedLength := 16;
-      Text := gcMap;
+      Text := gsMap;
       OnClick := @ProcSelectMapMenu;
     end;
     with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
@@ -2349,7 +2391,7 @@ begin
       AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
       AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
       AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
-      case g_Game_TextToMode(gcGameMode) of
+      case g_Game_TextToMode(gsGameMode) of
         GM_NONE,
         GM_DM:   ItemIndex := 0;
         GM_TDM:  ItemIndex := 1;
@@ -2365,8 +2407,8 @@ begin
       OnlyDigits := True;
       Width := 4;
       MaxLength := 5;
-      if gcTimeLimit > 0 then
-        Text := IntToStr(gcTimeLimit);
+      if gsTimeLimit > 0 then
+        Text := IntToStr(gsTimeLimit);
     end;
     with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
     begin
@@ -2374,8 +2416,8 @@ begin
       OnlyDigits := True;
       Width := 4;
       MaxLength := 5;
-      if gcGoalLimit > 0 then
-        Text := IntToStr(gcGoalLimit);
+      if gsGoalLimit > 0 then
+        Text := IntToStr(gsGoalLimit);
     end;
     with AddEdit(_lc[I_MENU_MAX_LIVES]) do
     begin
@@ -2383,8 +2425,17 @@ begin
       OnlyDigits := True;
       Width := 4;
       MaxLength := 5;
-      if gcMaxLives > 0 then
-        Text := IntToStr(gcMaxLives);
+      if gsMaxLives > 0 then
+        Text := IntToStr(gsMaxLives);
+    end;
+    with AddEdit(_lc[I_MENU_ITEM_RESPAWN_TIME]) do
+    begin
+      Name := 'edItemRespawnTime';
+      OnlyDigits := True;
+      Width := 4;
+      MaxLength := 5;
+      if gsItemRespawnTime > 0 then
+        Text := IntToStr(gsItemRespawnTime);
     end;
     with AddSwitch(_lc[I_MENU_PLAYERS]) do
     begin
@@ -2392,24 +2443,40 @@ begin
       AddItem(_lc[I_MENU_COUNT_NONE]);
       AddItem(_lc[I_MENU_PLAYERS_ONE]);
       AddItem(_lc[I_MENU_PLAYERS_TWO]);
-      ItemIndex := gcPlayers;
+      ItemIndex := gsPlayers;
     end;
     with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
     begin
       Name := 'swTeamDamage';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gcTeamDamage then
+      if LongBool(gsGameFlags and GAME_OPTION_TEAMDAMAGE) then
         ItemIndex := 0
       else
         ItemIndex := 1;
     end;
-    with AddSwitch(_lc[I_MENU_RESPAWN_ITEMS]) do
+    with AddSwitch(_lc[I_MENU_TEAM_HIT]) do
     begin
-      Name := 'swRespawnItems';
+      Name := 'swTeamHit';
+      AddItem(_lc[I_MENU_TEAM_HIT_BOTH]);
+      AddItem(_lc[I_MENU_TEAM_HIT_TRACE]);
+      AddItem(_lc[I_MENU_TEAM_HIT_PROJECTILE]);
+      AddItem(_lc[I_MENU_TEAM_HIT_NOTHING]);
+      if (gsGameFlags and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE)) = (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE) then
+        ItemIndex := 0
+      else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITTRACE) then
+        ItemIndex := 1
+      else if LongBool(gsGameFlags and GAME_OPTION_TEAMHITPROJECTILE) then
+        ItemIndex := 2
+      else
+        ItemIndex := 3;
+    end;
+    with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+    begin
+      Name := 'swDeathmatchKeys';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gcRespawnItems then
+      if LongBool(gsGameFlags and GAME_OPTION_DMKEYS) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2419,7 +2486,7 @@ begin
       Name := 'swEnableExits';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gcAllowExit then
+      if LongBool(gsGameFlags and GAME_OPTION_ALLOWEXIT) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2429,7 +2496,7 @@ begin
       Name := 'swWeaponStay';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gcWeaponStay then
+      if LongBool(gsGameFlags and GAME_OPTION_WEAPONSTAY) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2439,7 +2506,7 @@ begin
       Name := 'swMonsters';
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
-      if gcMonsters then
+      if LongBool(gsGameFlags and GAME_OPTION_MONSTERS) then
         ItemIndex := 0
       else
         ItemIndex := 1;
@@ -2451,9 +2518,9 @@ begin
       AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
       AddItem(_lc[I_MENU_BOTS_VS_ALL]);
       ItemIndex := 2;
-      if gcBotsVS = 'Players' then
+      if not LongBool(gsGameFlags and GAME_OPTION_BOTVSMONSTER) then
         ItemIndex := 0;
-      if gcBotsVS = 'Monsters' then
+      if not LongBool(gsGameFlags and GAME_OPTION_BOTVSPLAYER) then
         ItemIndex := 1;
     end;
     AddSpace();
@@ -2640,6 +2707,12 @@ begin
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
     end;
+    with AddSwitch(_lc[I_MENU_VIDEO_INTERPOLATION]) do
+    begin
+      Name := 'swInterp';
+      AddItem(_lc[I_MENU_YES]);
+      AddItem(_lc[I_MENU_NO]);
+    end;
     with AddSwitch(_lc[I_MENU_VIDEO_LEGACY_COMPATIBLE]) do
     begin
       Name := 'swLegacyNPOT';
@@ -2674,6 +2747,13 @@ begin
       AddItem(_lc[I_MENU_YES]);
       AddItem(_lc[I_MENU_NO]);
     end;
+    with AddSwitch(_lc[I_MENU_GAME_SCALE_FACTOR]) do
+    begin
+      Name := 'swResFactor';
+      AddItem('1x');
+      for i := 2 to gRC_Width div 640 do
+        AddItem(IntToStr(i) + 'x');
+    end;
     AddSpace();
     AddButton(@ProcApplyVideoOptions, _lc[I_MENU_RESOLUTION_APPLY]);
     UpdateIndex();
@@ -3274,6 +3354,22 @@ begin
       AddItem(_lc[I_MENU_NO]);
       ItemIndex := 1;
     end;
+    with AddSwitch(_lc[I_MENU_TEAM_HIT]) do
+    begin
+      Name := 'swTeamHit';
+      AddItem(_lc[I_MENU_TEAM_HIT_BOTH]);
+      AddItem(_lc[I_MENU_TEAM_HIT_TRACE]);
+      AddItem(_lc[I_MENU_TEAM_HIT_PROJECTILE]);
+      AddItem(_lc[I_MENU_TEAM_HIT_NOTHING]);
+      ItemIndex := 0
+    end;
+    with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+    begin
+      Name := 'swDeathmatchKeys';
+      AddItem(_lc[I_MENU_YES]);
+      AddItem(_lc[I_MENU_NO]);
+      ItemIndex := 1;
+    end;
     with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
     begin
       Name := 'edTimeLimit';