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

1 files changed, 10 insertions, 10 deletions

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)
 {