X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=ae047f82b8afcc86bfa283e05012af0964c9b3a5;hb=92655287ffab368ec7bf450fa3d82fb2328a7b99;hp=8efa5ca9fb4626cd1907e805d640db44e5153033;hpb=987c4a835a103345b59937e8e1be8524a6228712;p=d2df-sdl.git

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 8efa5ca..ae047f8 100644
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -454,7 +454,6 @@ begin
 
   it.ItemType := ItemType;
   it.Respawnable := Respawnable;
-  if g_Game_IsServer and (ITEM_RESPAWNTIME = 0) then it.Respawnable := False;
   it.InitX := X;
   it.InitY := Y;
   it.RespawnTime := 0;
@@ -510,6 +509,7 @@ var
   Anim: TAnimation;
   m: Word;
   r, nxt: Boolean;
+  actualRespawnable: Boolean;
 begin
   if (ggItems = nil) then exit;
 
@@ -577,7 +577,9 @@ begin
               // Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì
               if r then
               begin
-                if not Respawnable then g_Items_Remove(i) else g_Items_Pick(i);
+                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 g_Game_IsNet then MH_SEND_ItemDestroy(False, i);
                 nxt := True;
                 break;