diff options
author | rubidium <rubidium@openttd.org> | 2011-01-03 12:01:41 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-01-03 12:01:41 +0000 |
commit | b25cf57542dbf294a9de3f7a9910e1e08e6ed7a4 (patch) | |
tree | ac208841735480e0c06b3da6da55b33a1bbdc7c7 /src | |
parent | 1c2d56d314d5be9d228b08ca6eea8d988f2a389f (diff) | |
download | openttd-b25cf57542dbf294a9de3f7a9910e1e08e6ed7a4.tar.xz |
(svn r21701) -Codechange: ConsoleColour = TextColour, so make it that way and remove some unneeded casts
Diffstat (limited to 'src')
-rw-r--r-- | src/console.cpp | 4 | ||||
-rw-r--r-- | src/console_cmds.cpp | 4 | ||||
-rw-r--r-- | src/console_func.h | 4 | ||||
-rw-r--r-- | src/console_gui.cpp | 4 | ||||
-rw-r--r-- | src/console_internal.h | 2 | ||||
-rw-r--r-- | src/console_type.h | 20 | ||||
-rw-r--r-- | src/network/network.cpp | 2 | ||||
-rw-r--r-- | src/network/network_admin.cpp | 2 | ||||
-rw-r--r-- | src/network/network_admin.h | 2 | ||||
-rw-r--r-- | src/network/network_client.cpp | 6 | ||||
-rw-r--r-- | src/network/network_func.h | 2 | ||||
-rw-r--r-- | src/network/network_internal.h | 2 | ||||
-rw-r--r-- | src/network/network_server.cpp | 12 |
13 files changed, 33 insertions, 33 deletions
diff --git a/src/console.cpp b/src/console.cpp index c38608f91..5ffc4ed52 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -84,7 +84,7 @@ void IConsoleFree() * @param colour_code the colour of the command. Red in case of errors, etc. * @param string the message entered or output on the console (notice, error, etc.) */ -void IConsolePrint(ConsoleColour colour_code, const char *string) +void IConsolePrint(TextColour colour_code, const char *string) { assert(IsValidConsoleColour(colour_code)); @@ -128,7 +128,7 @@ void IConsolePrint(ConsoleColour colour_code, const char *string) * by any other means. Uses printf() style format, for more information look * at IConsolePrint() */ -void CDECL IConsolePrintF(ConsoleColour colour_code, const char *format, ...) +void CDECL IConsolePrintF(TextColour colour_code, const char *format, ...) { assert(IsValidConsoleColour(colour_code)); 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); diff --git a/src/console_func.h b/src/console_func.h index 8f674bb6b..aa220a998 100644 --- a/src/console_func.h +++ b/src/console_func.h @@ -23,8 +23,8 @@ void IConsoleFree(); void IConsoleClose(); /* console output */ -void IConsolePrint(ConsoleColour colour_code, const char *string); -void CDECL IConsolePrintF(ConsoleColour colour_code, const char *format, ...) WARN_FORMAT(2, 3); +void IConsolePrint(TextColour colour_code, const char *string); +void CDECL IConsolePrintF(TextColour colour_code, const char *format, ...) WARN_FORMAT(2, 3); void IConsoleDebug(const char *dbg, const char *string); void IConsoleWarning(const char *string); void IConsoleError(const char *string); diff --git a/src/console_gui.cpp b/src/console_gui.cpp index 757251f26..875e78d05 100644 --- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -489,8 +489,8 @@ static void IConsoleHistoryNavigate(int direction) * @param colour_code the colour of the command. Red in case of errors, etc. * @param str the message entered or output on the console (notice, error, etc.) */ -void IConsoleGUIPrint(ConsoleColour colour_code, char *str) +void IConsoleGUIPrint(TextColour colour_code, char *str) { - new IConsoleLine(str, (TextColour)colour_code); + new IConsoleLine(str, colour_code); SetWindowDirty(WC_CONSOLE, 0); } diff --git a/src/console_internal.h b/src/console_internal.h index 6fe2a4e1d..c46b34b19 100644 --- a/src/console_internal.h +++ b/src/console_internal.h @@ -82,7 +82,7 @@ bool GetArgumentInteger(uint32 *value, const char *arg); void IConsoleGUIInit(); void IConsoleGUIFree(); -void IConsoleGUIPrint(ConsoleColour colour_code, char *string); +void IConsoleGUIPrint(TextColour colour_code, char *string); char *RemoveUnderscores(char *name); #endif /* CONSOLE_INTERNAL_H */ diff --git a/src/console_type.h b/src/console_type.h index 4e08326af..2a99a7038 100644 --- a/src/console_type.h +++ b/src/console_type.h @@ -12,6 +12,8 @@ #ifndef CONSOLE_TYPE_H #define CONSOLE_TYPE_H +#include "gfx_type.h" + /** Modes of the in-game console. */ enum IConsoleModes { ICONSOLE_FULL, ///< In-game console is closed. @@ -19,16 +21,14 @@ enum IConsoleModes { ICONSOLE_CLOSED ///< In-game console is opened, whole screen. }; -/** Colours of the console messages. */ -enum ConsoleColour { - CC_DEFAULT = 1, - CC_ERROR = 3, - CC_WARNING = 13, - CC_INFO = 8, - CC_DEBUG = 5, - CC_COMMAND = 2, - CC_WHITE = 12, -}; +/* Colours of the console messages. */ +static const TextColour CC_DEFAULT = TC_SILVER; ///< Default colour of the console. +static const TextColour CC_ERROR = TC_RED; ///< Colour for error lines. +static const TextColour CC_WARNING = TC_LIGHT_BLUE; ///< Colour for warning lines. +static const TextColour CC_INFO = TC_YELLOW; ///< Colour for information lines. +static const TextColour CC_DEBUG = TC_LIGHT_BROWN; ///< Colour for debug output. +static const TextColour CC_COMMAND = TC_GOLD; ///< Colour for the console's commands. +static const TextColour CC_WHITE = TC_WHITE; ///< White console lines for various things such as the welcome. static inline bool IsValidConsoleColour(uint c) { diff --git a/src/network/network.cpp b/src/network/network.cpp index 510d92a82..c304c1c22 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -163,7 +163,7 @@ bool NetworkCompanyIsPassworded(CompanyID company_id) /* This puts a text-message to the console, or in the future, the chat-box, * (to keep it all a bit more general) * If 'self_send' is true, this is the client who is sending the message */ -void NetworkTextMessage(NetworkAction action, ConsoleColour colour, bool self_send, const char *name, const char *str, int64 data) +void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const char *name, const char *str, int64 data) { StringID strid; switch (action) { diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp index fe76f164d..40085838d 100644 --- a/src/network/network_admin.cpp +++ b/src/network/network_admin.cpp @@ -783,7 +783,7 @@ void NetworkAdminChat(NetworkAction action, DestType desttype, ClientID client_i * @param colour_code The colour of the string. * @param string The string to show. */ -void NetworkServerSendAdminRcon(AdminIndex admin_index, ConsoleColour colour_code, const char *string) +void NetworkServerSendAdminRcon(AdminIndex admin_index, TextColour colour_code, const char *string) { ServerNetworkAdminSocketHandler::Get(admin_index)->SendRcon(colour_code, string); } diff --git a/src/network/network_admin.h b/src/network/network_admin.h index 501c91dc0..d9f64c73e 100644 --- a/src/network/network_admin.h +++ b/src/network/network_admin.h @@ -95,7 +95,7 @@ void NetworkAdminCompanyRemove(CompanyID company_id, AdminCompanyRemoveReason bc void NetworkAdminChat(NetworkAction action, DestType desttype, ClientID client_id, const char *msg, int64 data = 0, bool from_admin = false); void NetworkAdminUpdate(AdminUpdateFrequency freq); -void NetworkServerSendAdminRcon(AdminIndex admin_index, ConsoleColour colour_code, const char *string); +void NetworkServerSendAdminRcon(AdminIndex admin_index, TextColour colour_code, const char *string); void NetworkAdminConsole(const char *origin, const char *string); void NetworkAdminCmdLogging(const NetworkClientSocket *owner, const CommandPacket *cp); diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 326c3755a..b45b21fa5 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -981,7 +981,7 @@ DEF_GAME_RECEIVE_COMMAND(Client, PACKET_SERVER_CHAT) } if (ci != NULL) { - NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), self_send, name, msg, data); + NetworkTextMessage(action, GetDrawStringCompanyColour(ci->client_playas), self_send, name, msg, data); } return NETWORK_RECV_STATUS_OKAY; } @@ -1069,13 +1069,13 @@ DEF_GAME_RECEIVE_COMMAND(Client, PACKET_SERVER_RCON) { if (this->status < STATUS_AUTHORIZED) return NETWORK_RECV_STATUS_MALFORMED_PACKET; - uint colour_code = p->Recv_uint16(); + TextColour colour_code = (TextColour)p->Recv_uint16(); if (!IsValidConsoleColour(colour_code)) return NETWORK_RECV_STATUS_MALFORMED_PACKET; char rcon_out[NETWORK_RCONCOMMAND_LENGTH]; p->Recv_string(rcon_out, sizeof(rcon_out)); - IConsolePrint((ConsoleColour)colour_code, rcon_out); + IConsolePrint(colour_code, rcon_out); return NETWORK_RECV_STATUS_OKAY; } diff --git a/src/network/network_func.h b/src/network/network_func.h index f9bbde778..29d924ae4 100644 --- a/src/network/network_func.h +++ b/src/network/network_func.h @@ -72,7 +72,7 @@ NetworkClientInfo *NetworkFindClientInfoFromClientID(ClientID client_id); const char *GetClientIP(NetworkClientInfo *ci); void NetworkServerDoMove(ClientID client_id, CompanyID company_id); -void NetworkServerSendRcon(ClientID client_id, ConsoleColour colour_code, const char *string); +void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, const char *string); void NetworkServerSendChat(NetworkAction action, DestType type, int dest, const char *msg, ClientID from_id, int64 data = 0, bool from_admin = false); void NetworkServerKickClient(ClientID client_id); diff --git a/src/network/network_internal.h b/src/network/network_internal.h index 5373e4422..40391a7a8 100644 --- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -163,7 +163,7 @@ void NetworkSyncCommandQueue(NetworkClientSocket *cs); /* from network.c */ void NetworkError(StringID error_string); -void NetworkTextMessage(NetworkAction action, ConsoleColour colour, bool self_send, const char *name, const char *str = "", int64 data = 0); +void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const char *name, const char *str = "", int64 data = 0); uint NetworkCalculateLag(const NetworkClientSocket *cs); NetworkClientSocket *NetworkFindClientStateFromClientID(ClientID client_id); StringID GetNetworkErrorMsg(NetworkErrorCode err); diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 7526d50fc..8ec5da468 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1142,7 +1142,7 @@ void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, co ci = NetworkFindClientInfoFromClientID(from_id); /* Display the text locally, and that is it */ if (ci != NULL) { - NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); + NetworkTextMessage(action, GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); if (_settings_client.network.server_admin_chat) { NetworkAdminChat(action, desttype, from_id, msg, data, from_admin); @@ -1164,7 +1164,7 @@ void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, co ci = NetworkFindClientInfoFromClientID(from_id); ci_to = NetworkFindClientInfoFromClientID((ClientID)dest); if (ci != NULL && ci_to != NULL) { - NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), true, ci_to->client_name, msg, data); + NetworkTextMessage(action, GetDrawStringCompanyColour(ci->client_playas), true, ci_to->client_name, msg, data); } } else { FOR_ALL_CLIENT_SOCKETS(cs) { @@ -1198,7 +1198,7 @@ void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, co ci = NetworkFindClientInfoFromClientID(from_id); ci_own = NetworkFindClientInfoFromClientID(CLIENT_ID_SERVER); if (ci != NULL && ci_own != NULL && ci_own->client_playas == dest) { - NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); + NetworkTextMessage(action, GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); if (from_id == CLIENT_ID_SERVER) show_local = false; ci_to = ci_own; } @@ -1213,7 +1213,7 @@ void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, co StringID str = Company::IsValidID(ci_to->client_playas) ? STR_COMPANY_NAME : STR_NETWORK_SPECTATORS; SetDParam(0, ci_to->client_playas); GetString(name, str, lastof(name)); - NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci_own->client_playas), true, name, msg, data); + NetworkTextMessage(action, GetDrawStringCompanyColour(ci_own->client_playas), true, name, msg, data); } else { FOR_ALL_CLIENT_SOCKETS(cs) { if (cs->client_id == from_id) { @@ -1236,7 +1236,7 @@ void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, co ci = NetworkFindClientInfoFromClientID(from_id); if (ci != NULL) { - NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); + NetworkTextMessage(action, GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); } break; } @@ -1846,7 +1846,7 @@ void NetworkServerDoMove(ClientID client_id, CompanyID company_id) NetworkServerSendChat(action, DESTTYPE_BROADCAST, 0, "", client_id, company_id + 1); } -void NetworkServerSendRcon(ClientID client_id, ConsoleColour colour_code, const char *string) +void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, const char *string) { NetworkFindClientStateFromClientID(client_id)->SendRConResult(colour_code, string); } |