X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=200ebdd96cf725a2bc486d043e66bfce96ce46e4;hb=be2ad7bf5e09b4ee91a0c5ee741503ace8c7887c;hp=ae047f82b8afcc86bfa283e05012af0964c9b3a5;hpb=92655287ffab368ec7bf450fa3d82fb2328a7b99;p=d2df-sdl.git

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index ae047f8..200ebdd 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
 
@@ -509,7 +508,6 @@ var
   Anim: TAnimation;
   m: Word;
   r, nxt: Boolean;
-  actualRespawnable: Boolean;
 begin
   if (ggItems = nil) then exit;
 
@@ -577,9 +575,10 @@ begin
               // Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì
               if r then
               begin
-                actualRespawnable := Respawnable
-                  and ((ITEM_RESPAWNTIME > 0) and LongBool(gGameSettings.Options and GAME_OPTION_RESPAWNITEMS));
-                if not actualRespawnable then g_Items_Remove(i) else g_Items_Pick(i);
+                if not (Respawnable and (gGameSettings.ItemRespawnTime > 0)) then
+                  g_Items_Remove(i)
+                else 
+                  g_Items_Pick(i);
                 if g_Game_IsNet then MH_SEND_ItemDestroy(False, i);
                 nxt := True;
                 break;
@@ -692,7 +691,7 @@ begin
   if (ID < Length(ggItems)) then
   begin
     ggItems[ID].alive := false;
-    ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
+    ggItems[ID].RespawnTime := gGameSettings.ItemRespawnTime * 36;
   end;
 end;