DEADSOFTWARE

game: set randomized rulez respawn to false
authorTerminalHash <lyashuk.voxx@gmail.com>
Fri, 1 Sep 2023 08:19:18 +0000 (11:19 +0300)
committerTerminalHash <lyashuk.voxx@gmail.com>
Fri, 1 Sep 2023 08:19:54 +0000 (11:19 +0300)
src/game/g_game.pas
src/game/g_items.pas
src/game/g_menu.pas

index 87a928f962588bcd69f470206a0399d85155f175..7c499d4958f690958daecda3d5fd070d97fd67c3 100644 (file)
@@ -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
index b0cd320c96f5258e40052c5dbf98b904e99c9408..a7cbe4a8c846d7fd5ff54309f353d16fd6a6e57a 100644 (file)
@@ -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;
index 8da0b63c93a5c66826098e2965a5b060264917c1..b4a4dfd4095fa077ebe7f4ef9b6e80d183abaa48 100644 (file)
@@ -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