diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index b4a4dfd4095fa077ebe7f4ef9b6e80d183abaa48..d9a8c6d7a16d39be58481ba48c93467af4a5d7e9 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
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);
+ gsRulezRespawnTime := StrToIntDef(TGUIEdit(GetControl('edRulezRespawnTime')).Text, 0);
+ gsRulezRespawnRandom := StrToIntDef(TGUIEdit(GetControl('edRulezRespawnRandom')).Text, 0);
gsPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
gsMap := Map;
// TODO: get this crap out of here
gGameSettings.ItemRespawnTime := gsItemRespawnTime;
- gGameSettings.RulezTimeMultiplier := gsRulezTimeMultiplier;
+ gGameSettings.RulezRespawnTime := gsRulezRespawnTime;
+ gGameSettings.RulezRespawnRandom := gsRulezRespawnRandom;
gGameSettings.WarmupTime := gsWarmupTime;
gGameSettings.SpawnInvul := gsSpawnInvul;
end;
if gsItemRespawnTime > 0 then
Text := IntToStr(gsItemRespawnTime);
end;
- with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_MULTIPLIER]) do
+ AddSpace(); // Rulez Respawn block
+ with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_TIME]) do
begin
- Name := 'edRulezTimeMultiplier';
+ Name := 'edRulezRespawnTime';
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gsRulezTimeMultiplier > 0 then
- Text := IntToStr(gsRulezTimeMultiplier);
+ 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;
+ 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;
+ AddSpace();
with AddSwitch(_lc[I_MENU_PLAYERS]) do
begin
Name := 'swPlayers';
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';
if gsItemRespawnTime > 0 then
Text := IntToStr(gsItemRespawnTime);
end;
- with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_MULTIPLIER]) do
+ AddSpace(); // Rulez Respawn block
+ with AddEdit(_lc[I_MENU_RULEZ_RESPAWN_TIME]) do
begin
- Name := 'edRulezTimeMultiplier';
+ Name := 'edRulezRespawnTime';
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gsRulezTimeMultiplier > 0 then
- Text := IntToStr(gsRulezTimeMultiplier);
+ 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;
+ 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;
+ AddSpace();
with AddSwitch(_lc[I_MENU_PLAYERS]) do
begin
Name := 'swPlayers';
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';