X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=8d476efe76e6fa3fc1c27f98644e2def961704b4;hb=4ead372f76709eb9dfeb4ebd9e190d9d5fdfcc83;hp=9693ad07f31270f0d4e691a33ebcd66de8cbe04d;hpb=0b34f8195a84d9aecc7cd9f17fd1902b7723e3b8;p=d2df-sdl.git

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 9693ad0..8d476ef 100644
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -83,7 +83,6 @@ function g_Items_ForEachAlive (cb: TItemEachAliveCB; backwards: Boolean=false):
 var
   gItemsTexturesID: Array [1..ITEM_MAX] of DWORD;
   gMaxDist: Integer = 1; // for sounds
-  ITEM_RESPAWNTIME: Integer = 60 * 36;
 
 implementation
 
@@ -507,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;
@@ -576,7 +578,7 @@ begin
               // Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì
               if r then
               begin
-                if not (Respawnable and (ITEM_RESPAWNTIME > 0)) then
+                if not (Respawnable and (ItemRespawnTime > 0)) then
                   g_Items_Remove(i)
                 else 
                   g_Items_Pick(i);
@@ -692,7 +694,7 @@ begin
   if (ID < Length(ggItems)) then
   begin
     ggItems[ID].alive := false;
-    ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
+    ggItems[ID].RespawnTime := IfThen(gLMSRespawn = LMS_RESPAWN_NONE, gGameSettings.ItemRespawnTime, 15) * 36;
   end;
 end;