dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21701) -Codechange: ConsoleColour = TextColour, so make it that way and remove some unneeded casts

Browse Source
This commit is contained in:
rubidium
2011-01-03 12:01:41 +00:00
parent 8d9c6ecf7f
commit 692e61d1dc
13 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/console_cmds.cpp
View File

@@ -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);