actually record the deserialized material mask val

develop
Myk Taylor 2023-03-23 10:48:33 -07:00
parent 4d540ba8ab
commit 873e94ea5d
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
4 changed files with 10 additions and 11 deletions

@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Fixes ## Fixes
- `tailor`: now properly discriminates between dyed and undyed cloth and no longer defaults to using adamantine - `tailor`: now properly discriminates between dyed and undyed cloth and no longer defaults to using adamantine
- `buildingplan`: upright spike traps are now placed extended rather than retracted - `buildingplan`: upright spike traps are now placed extended rather than retracted
- `buildingplan`: fixed material filter getting lost for planning buildings on save/reload
## Misc Improvements ## Misc Improvements
- `stockpiles`: support applying stockpile configurations with fully enabled categories to stockpiles in worlds other than the one where the configuration was exported from - `stockpiles`: support applying stockpile configurations with fully enabled categories to stockpiles in worlds other than the one where the configuration was exported from

@ -130,7 +130,7 @@ static const vector<const df::job_item *> & get_job_items(color_ostream &out, Bu
}, },
[&](lua_State *L) { [&](lua_State *L) {
df::job_item *jitem = Lua::GetDFObject<df::job_item>(L, -1); df::job_item *jitem = Lua::GetDFObject<df::job_item>(L, -1);
DEBUG(status,out).print("retrieving job_item for (%d, %d, %d) index=%d: %p\n", DEBUG(status,out).print("retrieving job_item for (%d, %d, %d) index=%d: 0x%p\n",
std::get<0>(key), std::get<1>(key), std::get<2>(key), index, jitem); std::get<0>(key), std::get<1>(key), std::get<2>(key), index, jitem);
if (!jitem) if (!jitem)
failed = true; failed = true;
@ -311,7 +311,7 @@ DFhackCExport command_result plugin_load_data (color_ostream &out) {
PlannedBuilding pb(out, building_configs[idx]); PlannedBuilding pb(out, building_configs[idx]);
df::building *bld = df::building::find(pb.id); df::building *bld = df::building::find(pb.id);
if (!bld) { if (!bld) {
INFO(status,out).print("building %d no longer exists; skipping\n", pb.id); DEBUG(status,out).print("building %d no longer exists; skipping\n", pb.id);
pb.remove(out); pb.remove(out);
continue; continue;
} }

@ -35,7 +35,7 @@ bool ItemFilter::isEmpty() const {
&& materials.empty(); && materials.empty();
} }
static bool deserializeMaterialMask(string ser, df::dfhack_material_category mat_mask) { static bool deserializeMaterialMask(const string& ser, df::dfhack_material_category& mat_mask) {
if (ser.empty()) if (ser.empty())
return true; return true;
@ -46,7 +46,7 @@ static bool deserializeMaterialMask(string ser, df::dfhack_material_category mat
return true; return true;
} }
static bool deserializeMaterials(string ser, set<DFHack::MaterialInfo> &materials) { static bool deserializeMaterials(const string& ser, set<DFHack::MaterialInfo> &materials) {
if (ser.empty()) if (ser.empty())
return true; return true;
@ -63,7 +63,7 @@ static bool deserializeMaterials(string ser, set<DFHack::MaterialInfo> &material
return true; return true;
} }
ItemFilter::ItemFilter(color_ostream &out, string serialized) : ItemFilter() { ItemFilter::ItemFilter(color_ostream &out, const string& serialized) : ItemFilter() {
vector<string> tokens; vector<string> tokens;
split_string(&tokens, serialized, "/"); split_string(&tokens, serialized, "/");
if (tokens.size() < 5) { if (tokens.size() < 5) {
@ -87,11 +87,9 @@ string ItemFilter::serialize() const {
std::ostringstream ser; std::ostringstream ser;
ser << bitfield_to_string(mat_mask, ",") << "/"; ser << bitfield_to_string(mat_mask, ",") << "/";
vector<string> matstrs; vector<string> matstrs;
if (!materials.empty()) {
for (auto &mat : materials) for (auto &mat : materials)
matstrs.emplace_back(mat.getToken()); matstrs.emplace_back(mat.getToken());
ser << join_strings(",", matstrs); ser << join_strings(",", matstrs);
}
ser << "/" << static_cast<int>(min_quality); ser << "/" << static_cast<int>(min_quality);
ser << "/" << static_cast<int>(max_quality); ser << "/" << static_cast<int>(max_quality);
ser << "/" << static_cast<int>(decorated_only); ser << "/" << static_cast<int>(decorated_only);

@ -8,7 +8,7 @@
class ItemFilter { class ItemFilter {
public: public:
ItemFilter(); ItemFilter();
ItemFilter(DFHack::color_ostream &out, std::string serialized); ItemFilter(DFHack::color_ostream &out, const std::string& serialized);
void clear(); void clear();
bool isEmpty() const; bool isEmpty() const;