X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_menu.pas;h=80989a887ad4a2d8d46a91a3afc4e992fd4c0559;hb=4bbb1dced3434adcd1fdd0168c9de9ce64e42ce4;hp=8cd9363c8da74eb2112b972339e9eab2fa7528a1;hpb=555f5293fc0e11c8965e6d13c639e545b0228eb9;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 8cd9363..80989a8 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -790,6 +790,9 @@ begin
       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;
 
@@ -2884,6 +2887,9 @@ begin
       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
@@ -2893,8 +2899,14 @@ begin
         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 := 4;
+        ItemIndex := 7;
     end;
     AddSpace();// Items Respawn block
     with AddEdit(_lc[I_MENU_ITEM_RESPAWN_TIME]) do