summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-12-24 11:14:33 +0100
committerAlexander Harkness <bearbin@gmail.com>2013-12-24 11:14:33 +0100
commitbe79d12966dac2b5e3ec4ce711b8d4e2372cef7d (patch)
tree699956b801b4b4f8def886f8c5a3096a043990cd /src
parentMerge pull request #466 from Sxw1212/master (diff)
downloadcuberite-be79d12966dac2b5e3ec4ce711b8d4e2372cef7d.tar
cuberite-be79d12966dac2b5e3ec4ce711b8d4e2372cef7d.tar.gz
cuberite-be79d12966dac2b5e3ec4ce711b8d4e2372cef7d.tar.bz2
cuberite-be79d12966dac2b5e3ec4ce711b8d4e2372cef7d.tar.lz
cuberite-be79d12966dac2b5e3ec4ce711b8d4e2372cef7d.tar.xz
cuberite-be79d12966dac2b5e3ec4ce711b8d4e2372cef7d.tar.zst
cuberite-be79d12966dac2b5e3ec4ce711b8d4e2372cef7d.zip
Diffstat (limited to 'src')
-rw-r--r--src/ChatColor.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ChatColor.cpp b/src/ChatColor.cpp
index 2b223ee76..dca274d76 100644
--- a/src/ChatColor.cpp
+++ b/src/ChatColor.cpp
@@ -1,4 +1,3 @@
-
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "ChatColor.h"
@@ -29,9 +28,9 @@ const std::string cChatColor::Underlined = cChatColor::Color + "n";
const std::string cChatColor::Italic = cChatColor::Color + "o";
const std::string cChatColor::Plain = cChatColor::Color + "r";
-const std::string cChatColor::MakeColor( char a_Color )
+const std::string cChatColor::MakeColor( std::string a_Color )
{
- return cChatColor::Color + a_Color;
+ return a_Color;
}