|
|
@ -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;
|
|
|
|