From 4ead372f76709eb9dfeb4ebd9e190d9d5fdfcc83 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Thu, 27 Feb 2020 21:48:21 +0300 Subject: [PATCH] always respawn all items during warmup --- src/game/g_items.pas | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/game/g_items.pas b/src/game/g_items.pas index 200ebdd..8d476ef 100644 --- a/src/game/g_items.pas +++ b/src/game/g_items.pas @@ -506,11 +506,14 @@ var i, j, k: Integer; ID: DWord; Anim: TAnimation; - m: Word; + m, ItemRespawnTime: Word; r, nxt: Boolean; begin if (ggItems = nil) then exit; + // respawn items in 15 seconds regardless of settings during warmup + ItemRespawnTime := IfThen(gLMSRespawn = LMS_RESPAWN_NONE, gGameSettings.ItemRespawnTime, 15); + for i := 0 to High(ggItems) do begin if (ggItems[i].ItemType = ITEM_NONE) then continue; @@ -575,7 +578,7 @@ begin // Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì if r then begin - if not (Respawnable and (gGameSettings.ItemRespawnTime > 0)) then + if not (Respawnable and (ItemRespawnTime > 0)) then g_Items_Remove(i) else g_Items_Pick(i); @@ -691,7 +694,7 @@ begin if (ID < Length(ggItems)) then begin ggItems[ID].alive := false; - ggItems[ID].RespawnTime := gGameSettings.ItemRespawnTime * 36; + ggItems[ID].RespawnTime := IfThen(gLMSRespawn = LMS_RESPAWN_NONE, gGameSettings.ItemRespawnTime, 15) * 36; end; end; -- 2.29.2