Merge branch 'master' of git://github.com/quietust/dfhack

Conflicts:
	library/LuaTypes.cpp
	library/LuaWrapper.cpp
develop
Robert Heinrich 2012-03-28 12:14:08 +02:00
commit baf0785807
1 changed files with 1 additions and 1 deletions

@ -179,7 +179,7 @@ namespace DFHack
void color(int index) void color(int index)
{ {
HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
SetConsoleTextAttribute(hConsole, index); SetConsoleTextAttribute(hConsole, index == color_ostream::COLOR_RESET ? default_attributes : index);
} }
void reset_color( void ) void reset_color( void )