X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_menu.pas;h=ed4e25dc7b89ab84452ae47b199b02164aa80384;hb=94590b18ecb2eeb8b0527d1eee20c7f85ada60b7;hp=f021de31011bce9e4b0ad6e4a79123d234e89a4b;hpb=fbef4d7a21bdc9a5b9c55f2b7b7d8ecde1151fe0;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index f021de3..ed4e25d 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -736,6 +736,7 @@ begin
     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;
 
@@ -750,6 +751,8 @@ 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;
@@ -771,6 +774,7 @@ begin
 
     // TODO: get this crap out of here
     gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+    gGameSettings.RulezTimeMultiplier := gsRulezTimeMultiplier;
     gGameSettings.WarmupTime := gsWarmupTime;
     gGameSettings.SpawnInvul := gsSpawnInvul;
   end;
@@ -1988,7 +1992,7 @@ begin
     if list <> nil then
     begin
       Items := list;
-      ItemIndex := Length(list)
+      ItemIndex := -1; (* nothing selected *)
     end
     else
     begin
@@ -2004,7 +2008,7 @@ begin
 
   TempResScale := Round(r_pixel_scale - 1);
   with TGUISwitch(menu.GetControl('swResFactor')) do
-    ItemIndex := Min(TempResScale, gRC_Width div 640 - 1);
+    ItemIndex := Max(Min(TempResScale, gRC_Width div 640 - 1), 0);
 end;
 
 procedure ProcApplyVideoOptions();
@@ -2325,6 +2329,15 @@ begin
       if gsItemRespawnTime > 0 then
         Text := IntToStr(gsItemRespawnTime);
     end;
+    with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_MULTIPLIER]) do
+    begin
+      Name := 'edRulezTimeMultiplier';
+      OnlyDigits := True;
+      Width := 4;
+      MaxLength := 5;
+      if gsRulezTimeMultiplier > 0 then
+        Text := IntToStr(gsRulezTimeMultiplier);
+    end;
     with AddSwitch(_lc[I_MENU_PLAYERS]) do
     begin
       Name := 'swPlayers';
@@ -2399,6 +2412,16 @@ begin
       else
         ItemIndex := 1;
     end;
+    with AddSwitch(_lc[I_MENU_ENABLE_RULEZ_RANDOM]) do
+    begin
+      Name := 'swRulezRandom';
+      AddItem(_lc[I_MENU_NO]);
+      AddItem(_lc[I_MENU_YES]);
+      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';
@@ -2573,6 +2596,15 @@ begin
       if gsItemRespawnTime > 0 then
         Text := IntToStr(gsItemRespawnTime);
     end;
+    with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_MULTIPLIER]) do
+    begin
+      Name := 'edRulezTimeMultiplier';
+      OnlyDigits := True;
+      Width := 4;
+      MaxLength := 5;
+      if gsRulezTimeMultiplier > 0 then
+        Text := IntToStr(gsRulezTimeMultiplier);
+    end;
     with AddSwitch(_lc[I_MENU_PLAYERS]) do
     begin
       Name := 'swPlayers';
@@ -2647,6 +2679,16 @@ begin
       else
         ItemIndex := 1;
     end;
+    with AddSwitch(_lc[I_MENU_ENABLE_RULEZ_RANDOM]) do
+    begin
+      Name := 'swRulezRandom';
+      AddItem(_lc[I_MENU_NO]);
+      AddItem(_lc[I_MENU_YES]);
+      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';