Switching new stockpile menu keys from green to red.

develop
Eric Wald 2014-08-17 16:01:42 -06:00
parent 71098b6108
commit c95ad05a7e
3 changed files with 6 additions and 5 deletions

@ -422,7 +422,7 @@ struct trade_hook : public df::viewscreen_dwarfmodest
int left_margin = dims.menu_x1 + 1; int left_margin = dims.menu_x1 + 1;
int x = left_margin; int x = left_margin;
int y = dims.y2 - 4; int y = dims.y2 - 4;
OutputToggleString(x, y, "Auto trade", "Shift-T", monitor.isMonitored(sp), true, left_margin); OutputToggleString(x, y, "Auto trade", "T", monitor.isMonitored(sp), true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
} }
}; };

@ -1378,7 +1378,7 @@ struct stocks_stockpile_hook : public df::viewscreen_dwarfmodest
int x = left_margin; int x = left_margin;
int y = dims.y2 - 5; int y = dims.y2 - 5;
OutputHotkeyString(x, y, "Show Inventory", "i", true, left_margin); OutputHotkeyString(x, y, "Show Inventory", "i", true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
} }
}; };

@ -133,10 +133,11 @@ void OutputFilterString(int &x, int &y, const char *text, const char *hotkey, bo
OutputString((state) ? COLOR_WHITE : COLOR_GREY, x, y, text, newline, left_margin); OutputString((state) ? COLOR_WHITE : COLOR_GREY, x, y, text, newline, left_margin);
} }
void OutputToggleString(int &x, int &y, const char *text, const char *hotkey, bool state, bool newline = true, int left_margin = 0, int8_t color = COLOR_WHITE) void OutputToggleString(int &x, int &y, const char *text, const char *hotkey, bool state, bool newline = true,
int left_margin = 0, int8_t color = COLOR_WHITE, int8_t hotkey_color = COLOR_LIGHTGREEN)
{ {
OutputHotkeyString(x, y, text, hotkey); OutputHotkeyString(x, y, text, hotkey, false, 0, color, hotkey_color);
OutputString(COLOR_WHITE, x, y, ": "); OutputString(color, x, y, ": ");
if (state) if (state)
OutputString(COLOR_GREEN, x, y, "On", newline, left_margin); OutputString(COLOR_GREEN, x, y, "On", newline, left_margin);
else else