diff options
| author | TriBlade9 <triblade9@mail.com> | 2015-01-16 14:54:26 +0800 |
|---|---|---|
| committer | Ekdohibs <nathanael.courant@laposte.net> | 2016-05-31 17:34:29 +0200 |
| commit | 1d40385d4aacf0cbea4b19ff06940e8c9bebaf47 (patch) | |
| tree | 39732d23598a1c14d514ff35d241f9499f0a3c13 /src/chat.h | |
| parent | 0e44af9f7056a78a8e561f708751acceacd149c1 (diff) | |
| download | minetest-1d40385d4aacf0cbea4b19ff06940e8c9bebaf47.tar.gz minetest-1d40385d4aacf0cbea4b19ff06940e8c9bebaf47.tar.bz2 minetest-1d40385d4aacf0cbea4b19ff06940e8c9bebaf47.zip | |
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/
Diffstat (limited to 'src/chat.h')
| -rw-r--r-- | src/chat.h | 6 |
1 files changed, 4 insertions, 2 deletions
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), |