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

Fix for gcc errors.

develop
Anuradha Dissanayake 2013-01-29 20:44:56 +13:00
parent 58125a57a7
commit ae8bb7c9f8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/buildingplan.cpp
Unescape Escape View File

@ -744,11 +744,13 @@ public:
filter->materials.clear();
// Category masks
for_each_(masks_column.getSelectedElems(),
auto masks = masks_column.getSelectedElems();
for_each_(masks,
[&] (df::dfhack_material_category *m) { filter->mat_mask.whole |= m->whole; });
// Specific materials
transform_(materials_column.getSelectedElems(), filter->materials,
auto materials = materials_column.getSelectedElems();
transform_(materials, filter->materials,
[] (MaterialInfo *m) { return *m; });
Screen::dismiss(this);
@ -1477,9 +1479,10 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
if (filter->decorated_only)
OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
OutputString(COLOR_BROWN, x, y, "Materials:", true, left_margin);
for_each_(filter->getMaterialFilterAsVector(),
auto filters = filter->getMaterialFilterAsVector();
for_each_(filters,
[&](string d) { OutputString(COLOR_BLUE, x, y, "*" + d, true, left_margin); });
}
}
@ -1527,4 +1530,4 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
}
return CR_OK;
}
}