From b25cf57542dbf294a9de3f7a9910e1e08e6ed7a4 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 3 Jan 2011 12:01:41 +0000 Subject: (svn r21701) -Codechange: ConsoleColour = TextColour, so make it that way and remove some unneeded casts --- src/console_cmds.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/console_cmds.cpp') diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 375f98cc5..85c3a6d98 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -958,7 +958,7 @@ DEF_CONSOLE_CMD(ConEchoC) } if (argc < 3) return false; - IConsolePrint((ConsoleColour)atoi(argv[1]), argv[2]); + IConsolePrint((TextColour)atoi(argv[1]), argv[2]); return true; } @@ -1626,7 +1626,7 @@ DEF_CONSOLE_CMD(ConContent) static const char * const types[] = { "Base graphics", "NewGRF", "AI", "AI library", "Scenario", "Heightmap", "Base sound", "Base music" }; assert_compile(lengthof(types) == CONTENT_TYPE_END - CONTENT_TYPE_BEGIN); static const char * const states[] = { "Not selected", "Selected", "Dep Selected", "Installed", "Unknown" }; - static const ConsoleColour state_to_colour[] = { CC_COMMAND, CC_INFO, CC_INFO, CC_WHITE, CC_ERROR }; + static const TextColour state_to_colour[] = { CC_COMMAND, CC_INFO, CC_INFO, CC_WHITE, CC_ERROR }; const ContentInfo *ci = *iter; IConsolePrintF(state_to_colour[ci->state], "%d, %s, %s, %s", ci->id, types[ci->type - 1], states[ci->state], ci->name); -- cgit v1.2.3-54-g00ecf