summaryrefslogtreecommitdiffstats
path: root/source/cPlayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/cPlayer.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp
index 9071a31b1..c7ef8e56d 100644
--- a/source/cPlayer.cpp
+++ b/source/cPlayer.cpp
@@ -1,3 +1,6 @@
+
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+
#include "cPlayer.h"
#include "cServer.h"
#include "cCreativeInventory.h"
@@ -7,7 +10,6 @@
#include "cPickup.h"
#include "cPluginManager.h"
#include "cChunk.h"
-#include "cMCLogger.h"
#include "cWindow.h"
#include "cBlockEntity.h"
#include "cGroupManager.h"
@@ -494,9 +496,6 @@ void cPlayer::SetIP( std::string a_IP )
m_IP = a_IP;
}
-#ifdef SendMessage // Cause stupid windows.h defines SendMessage as SendMessageA
-#undef SendMessage
-#endif
void cPlayer::SendMessage( const char* a_Message )
{
m_ClientHandle->Send( cPacket_Chat( a_Message ) );