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

Fix workflow.

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

12
plugins/workflow.cpp
Unescape Escape View File

@ -285,7 +285,7 @@ struct ItemConstraint {
int weight; int weight;
std::vector<ProtectedJob*> jobs; std::vector<ProtectedJob*> jobs;
enum item_quality min_quality; item_quality::item_quality min_quality;
int item_amount, item_count, item_inuse; int item_amount, item_count, item_inuse;
bool request_suspend, request_resume; bool request_suspend, request_resume;
@ -296,8 +296,7 @@ struct ItemConstraint {
public: public:
ItemConstraint() ItemConstraint()
: is_craft(false), weight(0), item_amount(0), item_count(0), item_inuse(0) : 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_active(false), cant_resume_reported(false), min_quality(Ordinary)
{} {}
int goalCount() { return config.ival(0); } int goalCount() { return config.ival(0); }
@ -685,7 +684,7 @@ static ItemConstraint *get_constraint(color_ostream &out, const std::string &str
return NULL; return NULL;
} }
enum item_quality minqual = Ordinary; item_quality::item_quality minqual = 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 = Ordinary;
@ -1504,13 +1503,14 @@ static command_result workflow_cmd(color_ostream &out, vector <string> & paramet
} }
df::building *workshop = NULL; df::building *workshop = NULL;
df::job *job = NULL; //FIXME: unused variable!
//df::job *job = NULL;
if (Gui::dwarfmode_hotkey(Core::getTopViewscreen()) && if (Gui::dwarfmode_hotkey(Core::getTopViewscreen()) &&
ui->main.mode == ui_sidebar_mode::QueryBuilding) ui->main.mode == ui_sidebar_mode::QueryBuilding)
{ {
workshop = world->selected_building; workshop = world->selected_building;
job = Gui::getSelectedWorkshopJob(out, true); //job = Gui::getSelectedWorkshopJob(out, true);
} }
std::string cmd = parameters.empty() ? "list" : parameters[0]; std::string cmd = parameters.empty() ? "list" : parameters[0];