From 0bffa2935854d1b1d0110a33707650cafe084af7 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 18 Nov 2016 20:00:04 +0100 Subject: Removed ClientHandle.h dependencies from common headers. --- src/Entities/Player.cpp | 123 +++++++++++++++++++++++++++++++++++++++++++++++- src/Entities/Player.h | 28 +++++------ 2 files changed, 134 insertions(+), 17 deletions(-) (limited to 'src/Entities') diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 009f1e829..ce3b8b195 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1,10 +1,12 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules +#include +#include + #include "Player.h" #include "Mobs/Wolf.h" #include "../BoundingBox.h" -#include #include "../ChatColor.h" #include "../Server.h" #include "../UI/InventoryWindow.h" @@ -18,7 +20,7 @@ #include "../Items/ItemHandler.h" #include "../Vector3.h" #include "../FastRandom.h" -#include +#include "../ClientHandle.h" #include "../WorldStorage/StatSerializer.h" #include "../CompositeChat.h" @@ -1354,6 +1356,123 @@ void cPlayer::CloseWindowIfID(char a_WindowID, bool a_CanRefuse) +void cPlayer::SendMessage(const AString & a_Message) +{ + m_ClientHandle->SendChat(a_Message, mtCustom); +} + + + + + +void cPlayer::SendMessageInfo(const AString & a_Message) +{ + m_ClientHandle->SendChat(a_Message, mtInformation); +} + + + + + +void cPlayer::SendMessageFailure(const AString & a_Message) +{ + m_ClientHandle->SendChat(a_Message, mtFailure); +} + + + + + +void cPlayer::SendMessageSuccess(const AString & a_Message) +{ + m_ClientHandle->SendChat(a_Message, mtSuccess); +} + + + + + +void cPlayer::SendMessageWarning(const AString & a_Message) +{ + m_ClientHandle->SendChat(a_Message, mtWarning); +} + + + + + +void cPlayer::SendMessageFatal(const AString & a_Message) +{ + m_ClientHandle->SendChat(a_Message, mtFailure); +} + + + + + +void cPlayer::SendMessagePrivateMsg(const AString & a_Message, const AString & a_Sender) +{ + m_ClientHandle->SendChat(a_Message, mtPrivateMessage, a_Sender); +} + + + + + +void cPlayer::SendMessage(const cCompositeChat & a_Message) +{ + m_ClientHandle->SendChat(a_Message); +} + + + + + +void cPlayer::SendMessageRaw(const AString & a_MessageRaw, eChatType a_Type) +{ + m_ClientHandle->SendChatRaw(a_MessageRaw, a_Type); +} + + + + + +void cPlayer::SendSystemMessage(const AString & a_Message) +{ + m_ClientHandle->SendChatSystem(a_Message, mtCustom); +} + + + + + +void cPlayer::SendAboveActionBarMessage(const AString & a_Message) +{ + m_ClientHandle->SendChatAboveActionBar(a_Message, mtCustom); +} + + + + + +void cPlayer::SendSystemMessage(const cCompositeChat & a_Message) +{ + m_ClientHandle->SendChatSystem(a_Message); +} + + + + + +void cPlayer::SendAboveActionBarMessage(const cCompositeChat & a_Message) +{ + m_ClientHandle->SendChatAboveActionBar(a_Message); +} + + + + + void cPlayer::SetGameMode(eGameMode a_GameMode) { if ((a_GameMode < gmMin) || (a_GameMode >= gmMax)) diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 3de1a4cb5..dab814692 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -5,7 +5,6 @@ #include "../Inventory.h" #include "../Defines.h" #include "../World.h" -#include "../ClientHandle.h" #include "../Statistics.h" @@ -248,20 +247,19 @@ public: // tolua_begin - void SendMessage (const AString & a_Message) { m_ClientHandle->SendChat(a_Message, mtCustom); } - void SendMessageInfo (const AString & a_Message) { m_ClientHandle->SendChat(a_Message, mtInformation); } - void SendMessageFailure (const AString & a_Message) { m_ClientHandle->SendChat(a_Message, mtFailure); } - void SendMessageSuccess (const AString & a_Message) { m_ClientHandle->SendChat(a_Message, mtSuccess); } - void SendMessageWarning (const AString & a_Message) { m_ClientHandle->SendChat(a_Message, mtWarning); } - void SendMessageFatal (const AString & a_Message) { m_ClientHandle->SendChat(a_Message, mtFailure); } - void SendMessagePrivateMsg (const AString & a_Message, const AString & a_Sender) { m_ClientHandle->SendChat(a_Message, mtPrivateMessage, a_Sender); } - void SendMessage (const cCompositeChat & a_Message) { m_ClientHandle->SendChat(a_Message); } - void SendMessageRaw (const AString & a_MessageRaw, eChatType a_Type = eChatType::ctChatBox) { m_ClientHandle->SendChatRaw(a_MessageRaw, a_Type); } - - void SendSystemMessage (const AString & a_Message) { m_ClientHandle->SendChatSystem(a_Message, mtCustom); } - void SendAboveActionBarMessage(const AString & a_Message) { m_ClientHandle->SendChatAboveActionBar(a_Message, mtCustom); } - void SendSystemMessage (const cCompositeChat & a_Message) { m_ClientHandle->SendChatSystem(a_Message); } - void SendAboveActionBarMessage(const cCompositeChat & a_Message) { m_ClientHandle->SendChatAboveActionBar(a_Message); } + void SendMessage (const AString & a_Message); + void SendMessageInfo (const AString & a_Message); + void SendMessageFailure (const AString & a_Message); + void SendMessageSuccess (const AString & a_Message); + void SendMessageWarning (const AString & a_Message); + void SendMessageFatal (const AString & a_Message); + void SendMessagePrivateMsg (const AString & a_Message, const AString & a_Sender); + void SendMessage (const cCompositeChat & a_Message); + void SendMessageRaw (const AString & a_MessageRaw, eChatType a_Type = eChatType::ctChatBox); + void SendSystemMessage (const AString & a_Message); + void SendAboveActionBarMessage(const AString & a_Message); + void SendSystemMessage (const cCompositeChat & a_Message); + void SendAboveActionBarMessage(const cCompositeChat & a_Message); const AString & GetName(void) const { return m_PlayerName; } void SetName(const AString & a_Name) { m_PlayerName = a_Name; } -- cgit v1.2.3