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

Fix workflow some more

develop
Petr Mrázek 2012-08-13 07:42:02 +02:00
parent 4eedd6f5f0
commit cde97bba6f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/workflow.cpp
Unescape Escape View File

@ -43,7 +43,6 @@ using std::string;
using std::endl; using std::endl;
using namespace DFHack; using namespace DFHack;
using namespace df::enums; using namespace df::enums;
using namespace df::enums::item_quality;
using df::global::world; using df::global::world;
using df::global::ui; using df::global::ui;
@ -296,7 +295,8 @@ struct ItemConstraint {
public: public:
ItemConstraint() ItemConstraint()
: is_craft(false), weight(0), min_quality(Ordinary),item_amount(0), item_count(0), item_inuse(0), is_active(false), cant_resume_reported(false) : is_craft(false), weight(0), min_quality(item_quality::Ordinary),item_amount(0),
item_count(0), item_inuse(0), is_active(false), cant_resume_reported(false)
{} {}
int goalCount() { return config.ival(0); } int goalCount() { return config.ival(0); }
@ -684,15 +684,15 @@ static ItemConstraint *get_constraint(color_ostream &out, const std::string &str
return NULL; return NULL;
} }
item_quality::item_quality minqual = Ordinary; item_quality::item_quality minqual = item_quality::Ordinary;
std::string qualstr = vector_get(tokens, 3); std::string qualstr = vector_get(tokens, 3);
if(!qualstr.empty()) { if(!qualstr.empty()) {
if(qualstr == "ordinary") minqual = Ordinary; if(qualstr == "ordinary") minqual = item_quality::Ordinary;
else if(qualstr == "wellcrafted") minqual = WellCrafted; else if(qualstr == "wellcrafted") minqual = item_quality::WellCrafted;
else if(qualstr == "finelycrafted") minqual = FinelyCrafted; else if(qualstr == "finelycrafted") minqual = item_quality::FinelyCrafted;
else if(qualstr == "superior") minqual = Superior; else if(qualstr == "superior") minqual = item_quality::Superior;
else if(qualstr == "exceptional") minqual = Exceptional; else if(qualstr == "exceptional") minqual = item_quality::Exceptional;
else if(qualstr == "masterful") minqual = Masterful; else if(qualstr == "masterful") minqual = item_quality::Masterful;
else { else {
out.printerr("Cannot find quality: %s\nKnown qualities: ordinary, wellcrafted, finelycrafted, superior, exceptional, masterful\n", qualstr.c_str()); out.printerr("Cannot find quality: %s\nKnown qualities: ordinary, wellcrafted, finelycrafted, superior, exceptional, masterful\n", qualstr.c_str());
return NULL; return NULL;