summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-18 08:25:14 +0200
committerarchshift <admin@archshift.com>2014-07-18 08:25:14 +0200
commitffe44c13d0ce037efb01544b96fe0756d64b8517 (patch)
tree573c9cebbb72dec4b9c0c3151423dc49c59a72ce
parentMerge pull request #1210 from Howaner/API (diff)
downloadcuberite-ffe44c13d0ce037efb01544b96fe0756d64b8517.tar
cuberite-ffe44c13d0ce037efb01544b96fe0756d64b8517.tar.gz
cuberite-ffe44c13d0ce037efb01544b96fe0756d64b8517.tar.bz2
cuberite-ffe44c13d0ce037efb01544b96fe0756d64b8517.tar.lz
cuberite-ffe44c13d0ce037efb01544b96fe0756d64b8517.tar.xz
cuberite-ffe44c13d0ce037efb01544b96fe0756d64b8517.tar.zst
cuberite-ffe44c13d0ce037efb01544b96fe0756d64b8517.zip
Diffstat (limited to '')
-rw-r--r--src/Defines.h1
-rw-r--r--src/Entities/Player.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/Defines.h b/src/Defines.h
index 877970ab8..f57e63c7f 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -1,7 +1,6 @@
#pragma once
-#include "ChatColor.h"
#include <limits>
#include <cmath>
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 5c3303cb2..ea11926b8 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -2,6 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Player.h"
+#include "../ChatColor.h"
#include "../Server.h"
#include "../UI/Window.h"
#include "../UI/WindowOwner.h"