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

dwarfmonitor: Get rid of "Clear" weather indicator

develop
lethosor 2015-06-10 23:05:33 -04:00
parent d663784707
commit eabcee38e5
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/dwarfmonitor.cpp
Unescape Escape View File

@ -1755,8 +1755,7 @@ struct dwarf_monitor_hook : public df::viewscreen_dwarfmodest
x = 1; x = 1;
y = gps->dimy - 1; y = gps->dimy - 1;
bool clear = false, bool rain = false,
rain = false,
snow = false; snow = false;
if (current_weather) if (current_weather)
{ {
@ -1767,24 +1766,18 @@ struct dwarf_monitor_hook : public df::viewscreen_dwarfmodest
{ {
switch ((*current_weather)[i][j]) switch ((*current_weather)[i][j])
{ {
case weather_type::None:
clear = true;
break;
case weather_type::Rain: case weather_type::Rain:
rain = true; rain = true;
break; break;
case weather_type::Snow: case weather_type::Snow:
snow = true; snow = true;
break; break;
default:
break;
} }
} }
} }
} }
if (clear && (rain || snow))
{
OutputString(COLOR_YELLOW, x, y, "Clear");
++x;
}
if (rain) if (rain)
{ {
OutputString(COLOR_LIGHTBLUE, x, y, "Rain"); OutputString(COLOR_LIGHTBLUE, x, y, "Rain");