From 6af04febaefa3715e0dd42083a781df9b7f5e54e Mon Sep 17 00:00:00 2001 From: TerminalHash Date: Fri, 1 Sep 2023 11:19:18 +0300 Subject: [PATCH] game: set randomized rulez respawn to false --- src/game/g_game.pas | 2 +- src/game/g_items.pas | 6 +++--- src/game/g_menu.pas | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 87a928f..7c499d4 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -5616,7 +5616,7 @@ begin end else if cmd = 'g_powerup_randomize_respawn' then begin - ParseGameFlag(GAME_OPTION_RULEZRANDOM, I_MSG_RULEZ_RANDOM_OFF, I_MSG_RULEZ_RANDOM_ON); + ParseGameFlag(GAME_OPTION_RULEZRANDOM, I_MSG_RULEZ_RANDOM_OFF, I_MSG_RULEZ_RANDOM_ON, False); end else if cmd = 'g_weaponstay' then begin diff --git a/src/game/g_items.pas b/src/game/g_items.pas index b0cd320..a7cbe4a 100644 --- a/src/game/g_items.pas +++ b/src/game/g_items.pas @@ -741,13 +741,13 @@ begin ggItems[ID].alive := false; ggItems[ID].RespawnTime := IfThen(gLMSRespawn = LMS_RESPAWN_NONE, gGameSettings.ItemRespawnTime, 15) * 36; - if ((gGameSettings.Options and GAME_OPTION_RULEZRANDOM) = 0) then // Random powerup respawn + if LongBool(gGameSettings.Options and GAME_OPTION_RULEZRANDOM) then // Random powerup respawn begin if ggItems[ID].ItemType in [ITEM_SPHERE_BLUE, ITEM_SPHERE_WHITE, ITEM_INVUL, - ITEM_INVIS, ITEM_MEDKIT_BLACK, ITEM_JETPACK] then + ITEM_INVIS, ITEM_MEDKIT_BLACK, ITEM_JETPACK, ITEM_SUIT] then begin ggItems[ID].RespawnTime := Random(gGameSettings.RulezTimeMultiplier) * 36; - //e_logwritefln ('Randomized number', []); + e_logwritefln ('Randomized number', []); end; end; end; diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas index 8da0b63..b4a4dfd 100644 --- a/src/game/g_menu.pas +++ b/src/game/g_menu.pas @@ -2430,9 +2430,9 @@ begin AddItem(_lc[I_MENU_YES]); AddItem(_lc[I_MENU_NO]); if LongBool(gsGameFlags and GAME_OPTION_RULEZRANDOM) then - ItemIndex := 1 + ItemIndex := 0 else - ItemIndex := 0; + ItemIndex := 1; end; with AddSwitch(_lc[I_MENU_BOTS_VS]) do begin -- 2.29.2