X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_menu.pas;h=80989a887ad4a2d8d46a91a3afc4e992fd4c0559;hb=69ce7bba28273182c38e5a6cfb27b10d81477501;hp=8da0b63c93a5c66826098e2965a5b060264917c1;hpb=0afc0aed48395daa3f4f4845b12df146dc4f3ab3;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 8da0b63..80989a8 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -735,8 +735,6 @@ begin
     gsTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
     gsScoreLimit := StrToIntDef(TGUIEdit(GetControl('edScoreLimit')).Text, 0);
     gsMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
-    gsItemRespawnTime := StrToIntDef(TGUIEdit(GetControl('edItemRespawnTime')).Text, 0);
-    gsRulezTimeMultiplier := StrToIntDef(TGUIEdit(GetControl('edRulezTimeMultiplier')).Text, 0);
     gsPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
     gsMap := Map;
 
@@ -753,8 +751,6 @@ begin
       gsGameFlags := gsGameFlags or GAME_OPTION_WEAPONSTAY;
     if TGUISwitch(GetControl('swMonsters')).ItemIndex = 0 then
       gsGameFlags := gsGameFlags or GAME_OPTION_MONSTERS;
-    if TGUISwitch(GetControl('swRulezRandom')).ItemIndex = 0 then
-      gsGameFlags := gsGameFlags or GAME_OPTION_RULEZRANDOM;
 
     case TGUISwitch(GetControl('swTeamHit')).ItemIndex of
       1: gsGameFlags := gsGameFlags or GAME_OPTION_TEAMHITTRACE;
@@ -775,11 +771,37 @@ begin
     end;
 
     // TODO: get this crap out of here
-    gGameSettings.ItemRespawnTime := gsItemRespawnTime;
-    gGameSettings.RulezTimeMultiplier := gsRulezTimeMultiplier;
     gGameSettings.WarmupTime := gsWarmupTime;
     gGameSettings.SpawnInvul := gsSpawnInvul;
   end;
+
+  // HACK: We keep the variables for the items in a different menu
+  with TGUIMenu(g_GUI_GetWindow('ItemsRespawnMenu').GetControl('mItemsRespawnMenu')) do
+  begin
+    gsItemRespawnTime := StrToIntDef(TGUIEdit(GetControl('edItemRespawnTime')).Text, 0);
+    gsItemRespawnRandom := StrToIntDef(TGUIEdit(GetControl('edItemRespawnRandom')).Text, 0);
+    gsRulezRespawnTime := StrToIntDef(TGUIEdit(GetControl('edRulezRespawnTime')).Text, 0);
+    gsRulezRespawnRandom := StrToIntDef(TGUIEdit(GetControl('edRulezRespawnRandom')).Text, 0);
+
+    if TGUISwitch(GetControl('swRulezRandom')).ItemIndex = 0 then
+      gsGameFlags := gsGameFlags or GAME_OPTION_RULEZRANDOM;
+
+    case TGUISwitch(GetControl('swItemsRandom')).ItemIndex of
+      1: gsGameFlags := gsGameFlags or GAME_OPTION_ITEMHELPRANDOM;
+      2: gsGameFlags := gsGameFlags or GAME_OPTION_ITEMAMMORANDOM;
+      3: gsGameFlags := gsGameFlags or GAME_OPTION_ITEMWEAPONRANDOM;
+      4: gsGameFlags := gsGameFlags or GAME_OPTION_ITEMHELPRANDOM or GAME_OPTION_ITEMAMMORANDOM;
+      5: gsGameFlags := gsGameFlags or GAME_OPTION_ITEMHELPRANDOM or GAME_OPTION_ITEMWEAPONRANDOM;
+      6: gsGameFlags := gsGameFlags or GAME_OPTION_ITEMAMMORANDOM or GAME_OPTION_ITEMWEAPONRANDOM;
+      0: gsGameFlags := gsGameFlags or GAME_OPTION_ITEMALLRANDOM;
+    end;
+
+    // TODO: get this crap out of here
+    gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+    gGameSettings.ItemRespawnRandom := gsItemRespawnRandom;
+    gGameSettings.RulezRespawnTime := gsRulezRespawnTime;
+    gGameSettings.RulezRespawnRandom := gsRulezRespawnRandom;
+  end;
 end;
 
 procedure ProcStartCustomGame();
@@ -1738,6 +1760,15 @@ begin
   end;
 end;
 
+procedure ProcItemsRespawnMenu();
+var
+  menu: TGUIMenu;
+begin
+  menu := TGUIMenu(g_GUI_GetWindow('ItemsRespawnMenu').GetControl('mItemsRespawnMenu'));
+
+  g_GUI_ShowWindow('ItemsRespawnMenu');
+end;
+
 procedure ReadGameSettings();
 var
   menu: TGUIMenu;
@@ -2322,24 +2353,13 @@ begin
       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 AddEdit(_lc[I_MENU_RULEZ_RESPAWN_MULTIPLIER]) do
+    with AddLabel(_lc[I_MENU_SELECT_ITEM_RESPAWN]) do
     begin
-      Name := 'edRulezTimeMultiplier';
-      OnlyDigits := True;
-      Width := 4;
-      MaxLength := 5;
-      if gsRulezTimeMultiplier > 0 then
-        Text := IntToStr(gsRulezTimeMultiplier);
+      Name := 'lbItemsRespawn';
+      FixedLength := 16;
+      OnClick := @ProcItemsRespawnMenu;
     end;
+    AddSpace();
     with AddSwitch(_lc[I_MENU_PLAYERS]) do
     begin
       Name := 'swPlayers';
@@ -2424,16 +2444,6 @@ begin
       else
         ItemIndex := 1;
     end;
-    with AddSwitch(_lc[I_MENU_ENABLE_RULEZ_RANDOM]) do
-    begin
-      Name := 'swRulezRandom';
-      AddItem(_lc[I_MENU_YES]);
-      AddItem(_lc[I_MENU_NO]);
-      if LongBool(gsGameFlags and GAME_OPTION_RULEZRANDOM) then
-        ItemIndex := 1
-      else
-        ItemIndex := 0;
-    end;
     with AddSwitch(_lc[I_MENU_BOTS_VS]) do
     begin
       Name := 'swBotsVS';
@@ -2599,24 +2609,13 @@ begin
       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 AddEdit(_lc[I_MENU_RULEZ_RESPAWN_MULTIPLIER]) do
+    with AddLabel(_lc[I_MENU_SELECT_ITEM_RESPAWN]) do
     begin
-      Name := 'edRulezTimeMultiplier';
-      OnlyDigits := True;
-      Width := 4;
-      MaxLength := 5;
-      if gsRulezTimeMultiplier > 0 then
-        Text := IntToStr(gsRulezTimeMultiplier);
+      Name := 'lbItemsRespawn';
+      FixedLength := 16;
+      OnClick := @ProcItemsRespawnMenu;
     end;
+    AddSpace();
     with AddSwitch(_lc[I_MENU_PLAYERS]) do
     begin
       Name := 'swPlayers';
@@ -2701,16 +2700,6 @@ begin
       else
         ItemIndex := 1;
     end;
-    with AddSwitch(_lc[I_MENU_ENABLE_RULEZ_RANDOM]) do
-    begin
-      Name := 'swRulezRandom';
-      AddItem(_lc[I_MENU_YES]);
-      AddItem(_lc[I_MENU_NO]);
-      if LongBool(gsGameFlags and GAME_OPTION_RULEZRANDOM) then
-        ItemIndex := 0
-      else
-        ItemIndex := 1;
-    end;
     with AddSwitch(_lc[I_MENU_BOTS_VS]) do
     begin
       Name := 'swBotsVS';
@@ -2875,6 +2864,93 @@ begin
   Menu.DefControl := 'mSelectMapMenu';
   g_GUI_AddWindow(Menu);
 
+  Menu := TGUIWindow.Create('ItemsRespawnMenu');
+  with TGUIMenu(Menu.AddChild(TGUIMenu.Create(gMenuFont, gMenuSmallFont, _lc[I_MENU_ITEM_RESPAWN]))) do
+  begin
+    Name := 'mItemsRespawnMenu';
+
+    // Switches separate from the time entry fields
+    with AddSwitch(_lc[I_MENU_ENABLE_RULEZ_RANDOM]) do
+    begin
+      Name := 'swRulezRandom';
+      AddItem(_lc[I_MENU_YES]);
+      AddItem(_lc[I_MENU_NO]);
+      if LongBool(gsGameFlags and GAME_OPTION_RULEZRANDOM) then
+        ItemIndex := 0
+      else
+        ItemIndex := 1;
+    end;
+    with AddSwitch(_lc[I_MENU_ENABLE_ITEM_RANDOM]) do
+    begin
+      Name := 'swItemsRandom';
+      AddItem(_lc[I_MENU_ITEM_RANDOM_ALL]);
+      AddItem(_lc[I_MENU_ITEM_RANDOM_HELP_ONLY]);
+      AddItem(_lc[I_MENU_ITEM_RANDOM_AMMO_ONLY]);
+      AddItem(_lc[I_MENU_ITEM_RANDOM_WEAPON_ONLY]);
+      AddItem(_lc[I_MENU_ITEM_RANDOM_HELP_AMMO]);
+      AddItem(_lc[I_MENU_ITEM_RANDOM_HELP_WEAPON]);
+      AddItem(_lc[I_MENU_ITEM_RANDOM_WEAPON_AMMO]);
+      AddItem(_lc[I_MENU_ITEM_RANDOM_NOTHING]);
+      if LongBool(gsGameFlags and GAME_OPTION_ITEMALLRANDOM) then
+        ItemIndex := 0
+      else if LongBool(gsGameFlags and GAME_OPTION_ITEMHELPRANDOM) then
+        ItemIndex := 1
+      else if LongBool(gsGameFlags and GAME_OPTION_ITEMAMMORANDOM) then
+        ItemIndex := 2
+      else if LongBool(gsGameFlags and GAME_OPTION_ITEMWEAPONRANDOM) then
+        ItemIndex := 3
+      else if (gsGameFlags and (GAME_OPTION_ITEMHELPRANDOM or GAME_OPTION_ITEMAMMORANDOM)) = (GAME_OPTION_ITEMHELPRANDOM or GAME_OPTION_ITEMAMMORANDOM) then
+        ItemIndex := 4
+      else if (gsGameFlags and (GAME_OPTION_ITEMHELPRANDOM or GAME_OPTION_ITEMWEAPONRANDOM)) = (GAME_OPTION_ITEMHELPRANDOM or GAME_OPTION_ITEMWEAPONRANDOM) then
+        ItemIndex := 5
+      else if (gsGameFlags and (GAME_OPTION_ITEMAMMORANDOM or GAME_OPTION_ITEMWEAPONRANDOM)) = (GAME_OPTION_ITEMAMMORANDOM or GAME_OPTION_ITEMWEAPONRANDOM) then
+        ItemIndex := 6
+      else
+        ItemIndex := 7;
+    end;
+    AddSpace();// Items Respawn block
+    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 AddEdit(_lc[I_MENU_ITEM_RESPAWN_RANDOM]) do
+    begin
+      Name := 'edItemRespawnRandom';
+      OnlyDigits := True;
+      Width := 4;
+      MaxLength := 5;
+      if gsItemRespawnTime > 0 then
+        Text := IntToStr(gsItemRespawnRandom);
+    end;
+    // Rulez Respawn block
+    with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_TIME]) do
+    begin
+      Name := 'edRulezRespawnTime';
+      OnlyDigits := True;
+      Width := 4;
+      MaxLength := 5;
+      if gsRulezRespawnTime > 0 then
+        Text := IntToStr(gsRulezRespawnTime);
+    end;
+    with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_RANDOM]) do
+    begin
+      Name := 'edRulezRespawnRandom';
+      OnlyDigits := True;
+      Width := 4;
+      MaxLength := 5;
+      if gsRulezRespawnRandom > 0 then
+        Text := IntToStr(gsRulezRespawnRandom);
+    end;
+    AddSpace();
+  end;
+  Menu.DefControl := 'mItemsRespawnMenu';
+  g_GUI_AddWindow(Menu);
+
   Menu := TGUIWindow.Create('OptionsMenu');
   with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_OPTIONS]))) do
   begin