MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'q-github/master'

develop
Alexander Gavrilov 2012-10-24 16:49:12 +04:00
parent 09f8e8e419 27c7dfde4f
commit 7b67df4b4e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/modules/Buildings.cpp
Unescape Escape View File

@ -762,7 +762,7 @@ static void markBuildingTiles(df::building *bld, bool remove)
static void linkRooms(df::building *bld) static void linkRooms(df::building *bld)
{ {
auto &vec = world->buildings.other[buildings_other_id::ANY_FREE]; auto &vec = world->buildings.other[buildings_other_id::IN_PLAY];
bool changed = false; bool changed = false;

2
plugins/autolabor.cpp
Unescape Escape View File

@ -1547,7 +1547,7 @@ static int stockcheck(color_ostream &out, vector <string> & parameters)
} }
std::vector<df::item*> &items = world->items.other[items_other_id::ANY_FREE]; std::vector<df::item*> &items = world->items.other[items_other_id::IN_PLAY];
// Precompute a bitmask with the bad flags // Precompute a bitmask with the bad flags
df::item_flags bad_flags; df::item_flags bad_flags;

2
plugins/siege-engine.cpp
Unescape Escape View File

@ -493,7 +493,7 @@ static int setAmmoItem(lua_State *L)
if (!entry.isValid()) if (!entry.isValid())
return 0; return 0;
engine->ammo_vector_id = job_item_vector_id::ANY_FREE; engine->ammo_vector_id = job_item_vector_id::IN_PLAY;
engine->ammo_item_type = item_type; engine->ammo_item_type = item_type;
FOR_ENUM_ITEMS(job_item_vector_id, id) FOR_ENUM_ITEMS(job_item_vector_id, id)

2
plugins/workflow.cpp
Unescape Escape View File

@ -1150,7 +1150,7 @@ static void map_job_items(color_ostream &out)
bool dry_buckets = isOptionEnabled(CF_DRYBUCKETS); bool dry_buckets = isOptionEnabled(CF_DRYBUCKETS);
std::vector<df::item*> &items = world->items.other[items_other_id::ANY_FREE]; std::vector<df::item*> &items = world->items.other[items_other_id::IN_PLAY];
for (size_t i = 0; i < items.size(); i++) for (size_t i = 0; i < items.size(); i++)
{ {