X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=a70bd54a61f9da0f9827996db6e1d654090da1df;hb=dad4ab1ddf5b9cfa035b2a2d158dc0dc7130e912;hp=028f9d0a86024e5c6b8343c6f45e98429228467c;hpb=414af04a1d69b3bc575c1f6c9bc869973e5293d7;p=d2df-sdl.git

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 028f9d0..a70bd54 100644
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -517,6 +517,7 @@ begin
   for i := 0 to High(ggItems) do
   begin
     if (ggItems[i].ItemType = ITEM_NONE) then continue;
+    if not ggItems[i].slotIsUsed then continue; // just in case
 
     with ggItems[i] do
     begin
@@ -634,6 +635,7 @@ begin
   for i := 0 to High(ggItems) do
   begin
     it := @ggItems[i];
+    if (not it.slotIsUsed) or (it.ItemType = ITEM_NONE) then continue; // just in case
     if not it.alive then continue;
     if (it.dropped <> dropflag) then continue;
 
@@ -699,7 +701,12 @@ var
   it: PItem;
   trig: Integer;
 begin
-  if not g_Items_ValidId(ID) then raise Exception.Create('g_Items_Remove: invalid item id');
+  if not g_Items_ValidId(ID) then
+  begin
+    //writeln('g_Items_Remove: invalid item id: ', ID);
+    raise Exception.Create('g_Items_Remove: invalid item id');
+    //exit;
+  end;
 
   it := @ggItems[ID];
   if (it.arrIdx <> Integer(ID)) then raise Exception.Create('g_Items_Remove: arrIdx desync');
@@ -719,7 +726,7 @@ var
 begin
   // Ñ÷èòàåì êîëè÷åñòâî ñóùåñòâóþùèõ ïðåäìåòîâ
   count := 0;
-  for i := 0 to High(ggItems) do if (ggItems[i].ItemType <> ITEM_NONE) then Inc(count);
+  for i := 0 to High(ggItems) do if (ggItems[i].ItemType <> ITEM_NONE) and (ggItems[i].slotIsUsed) then Inc(count);
 
   // Êîëè÷åñòâî ïðåäìåòîâ
   utils.writeInt(st, LongInt(count));
@@ -727,7 +734,7 @@ begin
 
   for i := 0 to High(ggItems) do
   begin
-    if (ggItems[i].ItemType <> ITEM_NONE) then
+    if (ggItems[i].ItemType <> ITEM_NONE) and (ggItems[i].slotIsUsed) then
     begin
       // Ñèãíàòóðà ïðåäìåòà
       utils.writeSign(st, 'ITEM');
@@ -807,7 +814,8 @@ begin
   for i := 0 to High(ggItems) do
   begin
     it := @ggItems[i];
-    if it.Respawnable then
+    if not it.slotIsUsed then continue;
+    if it.Respawnable and (it.ItemType <> ITEM_NONE) then
     begin
       it.QuietRespawn := True;
       it.RespawnTime := 0;
@@ -832,7 +840,7 @@ begin
   begin
     for idx := High(ggItems) downto 0 do
     begin
-      if ggItems[idx].alive then
+      if ggItems[idx].alive and ggItems[idx].slotIsUsed then
       begin
         result := cb(@ggItems[idx]);
         if result then exit;
@@ -843,7 +851,7 @@ begin
   begin
     for idx := 0 to High(ggItems) do
     begin
-      if ggItems[idx].alive then
+      if ggItems[idx].alive and ggItems[idx].slotIsUsed then
       begin
         result := cb(@ggItems[idx]);
         if result then exit;