From 1d40385d4aacf0cbea4b19ff06940e8c9bebaf47 Mon Sep 17 00:00:00 2001
From: TriBlade9 <triblade9@mail.com>
Date: Fri, 16 Jan 2015 14:54:26 +0800
Subject: Colored chat working as expected for both freetype and non-freetype
 builds. @nerzhul improvements * Add unit tests * Fix coding style * move
 guiChatConsole.hpp to client/

---
 src/chat.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/chat.h')

diff --git a/src/chat.h b/src/chat.h
index db4146d35..661cafc82 100644
--- a/src/chat.h
+++ b/src/chat.h
@@ -20,11 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CHAT_HEADER
 #define CHAT_HEADER
 
-#include "irrlichttypes.h"
 #include <string>
 #include <vector>
 #include <list>
 
+#include "irrlichttypes.h"
+#include "util/coloredstring.h"
+
 // Chat console related classes
 
 struct ChatLine
@@ -34,7 +36,7 @@ struct ChatLine
 	// name of sending player, or empty if sent by server
 	std::wstring name;
 	// message text
-	std::wstring text;
+	ColoredString text;
 
 	ChatLine(std::wstring a_name, std::wstring a_text):
 		age(0.0),
-- 
cgit v1.2.3