Update autotrade stockpile controls

develop
lethosor 2014-11-15 16:16:32 -05:00
parent 842bd3581d
commit 3c1e07252b
3 changed files with 19 additions and 4 deletions

@ -212,9 +212,23 @@ struct dump_hook : public df::viewscreen_dwarfmodest
auto dims = Gui::getDwarfmodeViewDims(); auto dims = Gui::getDwarfmodeViewDims();
int left_margin = dims.menu_x1 + 1; int left_margin = dims.menu_x1 + 1;
int x = left_margin; int x = left_margin;
int y = 26; int y = dims.y2 - 7;
OutputToggleString(x, y, "Auto dump", "Shift-D", monitor.isMonitored(sp), true, left_margin); int links = 0;
links += sp->links.give_to_pile.size();
links += sp->links.take_from_pile.size();
links += sp->links.give_to_workshop.size();
links += sp->links.take_from_workshop.size();
bool state = monitor.isMonitored(sp);
if (links + 12 >= y) {
y = dims.y2;
OutputString(COLOR_WHITE, x, y, "Auto: ");
OutputString(COLOR_LIGHTRED, x, y, "D");
OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "ump ");
} else {
OutputToggleString(x, y, "Auto dump", "D", state, true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
}
} }
}; };

@ -237,6 +237,7 @@ struct melt_hook : public df::viewscreen_dwarfmodest
if (links + 12 >= y) { if (links + 12 >= y) {
y = dims.y2; y = dims.y2;
OutputString(COLOR_WHITE, x, y, "Auto: "); OutputString(COLOR_WHITE, x, y, "Auto: ");
x += 5;
OutputString(COLOR_LIGHTRED, x, y, "M"); OutputString(COLOR_LIGHTRED, x, y, "M");
OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "elt "); OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "elt ");
} else { } else {

@ -432,7 +432,7 @@ struct trade_hook : public df::viewscreen_dwarfmodest
if (links + 12 >= y) { if (links + 12 >= y) {
y = dims.y2; y = dims.y2;
OutputString(COLOR_WHITE, x, y, "Auto: "); OutputString(COLOR_WHITE, x, y, "Auto: ");
x += 5; x += 11;
OutputString(COLOR_LIGHTRED, x, y, "T"); OutputString(COLOR_LIGHTRED, x, y, "T");
OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "rade "); OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "rade ");
} else { } else {