From 27c7dfde4f715e42c9bec87f88c07c0d696f6c43 Mon Sep 17 00:00:00 2001 From: Quietust Date: Tue, 23 Oct 2012 12:14:21 -0500 Subject: [PATCH] ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages --- library/modules/Buildings.cpp | 2 +- plugins/autolabor.cpp | 2 +- plugins/siege-engine.cpp | 2 +- plugins/workflow.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp index 89106ca87..6421114a1 100644 --- a/library/modules/Buildings.cpp +++ b/library/modules/Buildings.cpp @@ -762,7 +762,7 @@ static void markBuildingTiles(df::building *bld, bool remove) 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; diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp index 42ccae4c2..44984cfdb 100644 --- a/plugins/autolabor.cpp +++ b/plugins/autolabor.cpp @@ -1547,7 +1547,7 @@ static int stockcheck(color_ostream &out, vector & parameters) } - std::vector &items = world->items.other[items_other_id::ANY_FREE]; + std::vector &items = world->items.other[items_other_id::IN_PLAY]; // Precompute a bitmask with the bad flags df::item_flags bad_flags; diff --git a/plugins/siege-engine.cpp b/plugins/siege-engine.cpp index 324c924c4..5c7b8833a 100644 --- a/plugins/siege-engine.cpp +++ b/plugins/siege-engine.cpp @@ -493,7 +493,7 @@ static int setAmmoItem(lua_State *L) if (!entry.isValid()) 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; FOR_ENUM_ITEMS(job_item_vector_id, id) diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp index 2720baa83..57020b161 100644 --- a/plugins/workflow.cpp +++ b/plugins/workflow.cpp @@ -1133,7 +1133,7 @@ static void map_job_items(color_ostream &out) bool dry_buckets = isOptionEnabled(CF_DRYBUCKETS); - std::vector &items = world->items.other[items_other_id::ANY_FREE]; + std::vector &items = world->items.other[items_other_id::IN_PLAY]; for (size_t i = 0; i < items.size(); i++) {