From e70d7b404a986ec6ebdfd58f1c423cd7b589cb09 Mon Sep 17 00:00:00 2001
From: Anuradha Dissanayake <falconne@gmail.com>
Date: Sat, 20 Apr 2013 12:09:07 +1200
Subject: [PATCH] Don't exclude webs, check for items in inventory before
 discarding those without a valid position.

---
 plugins/stocks.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
index 7ac50fec8..9299fd0d7 100644
--- a/plugins/stocks.cpp
+++ b/plugins/stocks.cpp
@@ -543,7 +543,6 @@ private:
         bad_flags.bits.trader = true;
         bad_flags.bits.in_building = true;
         bad_flags.bits.garbage_collect = true;
-        bad_flags.bits.spider_web = true;
         bad_flags.bits.hostile = true;
         bad_flags.bits.removed = true;
         bad_flags.bits.dead_dwarf = true;
@@ -559,13 +558,13 @@ private:
             if (item->flags.whole & bad_flags.whole || item->flags.whole & hide_flags.whole)
                 continue;
 
-            if (item->pos.x == -30000)
-                continue;
-
             auto pos = getRealPos(item);
             if (!pos)
                 continue;
 
+            if (pos->x == -30000)
+                continue;
+
             auto designation = Maps::getTileDesignation(*pos);
             if (!designation)
                 continue;