Don't exclude webs, check for items in inventory before discarding those without a valid position.

develop
Anuradha Dissanayake 2013-04-20 12:09:07 +12:00
parent 811bd191d5
commit e70d7b404a
1 changed files with 3 additions and 4 deletions

@ -543,7 +543,6 @@ private:
bad_flags.bits.trader = true; bad_flags.bits.trader = true;
bad_flags.bits.in_building = true; bad_flags.bits.in_building = true;
bad_flags.bits.garbage_collect = true; bad_flags.bits.garbage_collect = true;
bad_flags.bits.spider_web = true;
bad_flags.bits.hostile = true; bad_flags.bits.hostile = true;
bad_flags.bits.removed = true; bad_flags.bits.removed = true;
bad_flags.bits.dead_dwarf = 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) if (item->flags.whole & bad_flags.whole || item->flags.whole & hide_flags.whole)
continue; continue;
if (item->pos.x == -30000)
continue;
auto pos = getRealPos(item); auto pos = getRealPos(item);
if (!pos) if (!pos)
continue; continue;
if (pos->x == -30000)
continue;
auto designation = Maps::getTileDesignation(*pos); auto designation = Maps::getTileDesignation(*pos);
if (!designation) if (!designation)
continue; continue;