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

Autolabor: fix unitialized variable bug causing broker to be inappropriately excluded from work

develop
Kelly Martin 2012-12-08 21:14:23 -06:00
parent 412a004751
commit 468412b9fc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/autolabor.cpp
Unescape Escape View File

@ -1762,6 +1762,8 @@ private:
{ {
state = OTHER; // dwarfs unable to grasp are incapable of nearly all labors state = OTHER; // dwarfs unable to grasp are incapable of nearly all labors
dwarf->clear_all = true; dwarf->clear_all = true;
if (print_debug)
out.print ("Dwarf %s is disabled, will not be assigned labors\n", dwarf->dwarf->name.first_name.c_str());
} }
else else
state = IDLE; state = IDLE;
@ -1795,7 +1797,7 @@ private:
dwarf->state = state; dwarf->state = state;
if (print_debug) if (print_debug)
out.print("Dwarf \"%s\": state %s\n", dwarf->dwarf->name.first_name.c_str(), state_names[dwarf->state]); out.print("Dwarf \"%s\": state %s %d\n", dwarf->dwarf->name.first_name.c_str(), state_names[dwarf->state], dwarf->clear_all);
// determine if dwarf has medical needs // determine if dwarf has medical needs
if (dwarf->dwarf->health) if (dwarf->dwarf->health)
@ -1884,8 +1886,7 @@ private:
dwarf->clear_labor(labor); dwarf->clear_labor(labor);
} }
} }
else if (state == IDLE)
if ((state == IDLE) && !dwarf->clear_all)
available_dwarfs.push_back(dwarf); available_dwarfs.push_back(dwarf);
} }
@ -1903,6 +1904,8 @@ public:
cnt_setting = cnt_traction = cnt_crutch = 0; cnt_setting = cnt_traction = cnt_crutch = 0;
need_food_water = 0; need_food_water = 0;
trader_requested = false;
FOR_ENUM_ITEMS(unit_labor, l) FOR_ENUM_ITEMS(unit_labor, l)
{ {
if (l == df::unit_labor::NONE) if (l == df::unit_labor::NONE)