diff options
author | Masy98 <masy@antheruscraft.de> | 2014-10-01 19:23:43 +0200 |
---|---|---|
committer | Masy98 <masy@antheruscraft.de> | 2014-10-01 19:23:43 +0200 |
commit | d37b047ebeb8b61c7af36d954f89bbe8cabe35d4 (patch) | |
tree | e7960a666620af6e3bcc22c43c15b4f7de808a59 /src/Root.h | |
parent | Fixed Red Sandstone and Prismarine drops (diff) | |
parent | Merge pull request #1493 from Masy98/blocks (diff) | |
download | cuberite-d37b047ebeb8b61c7af36d954f89bbe8cabe35d4.tar cuberite-d37b047ebeb8b61c7af36d954f89bbe8cabe35d4.tar.gz cuberite-d37b047ebeb8b61c7af36d954f89bbe8cabe35d4.tar.bz2 cuberite-d37b047ebeb8b61c7af36d954f89bbe8cabe35d4.tar.lz cuberite-d37b047ebeb8b61c7af36d954f89bbe8cabe35d4.tar.xz cuberite-d37b047ebeb8b61c7af36d954f89bbe8cabe35d4.tar.zst cuberite-d37b047ebeb8b61c7af36d954f89bbe8cabe35d4.zip |
Diffstat (limited to 'src/Root.h')
-rw-r--r-- | src/Root.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Root.h b/src/Root.h index 9a482556c..84c6a98ec 100644 --- a/src/Root.h +++ b/src/Root.h @@ -41,11 +41,12 @@ namespace Json class cRoot { public: - static bool m_TerminateEventRaised; - static cRoot * Get() { return s_Root; } // tolua_end + static bool m_TerminateEventRaised; + + cRoot(void); ~cRoot(); @@ -129,15 +130,15 @@ public: /// Sends a chat message to all connected clients (in all worlds) void BroadcastChat (const AString & a_Message, eMessageType a_ChatPrefix = mtCustom); - void BroadcastChatInfo (const AString & a_Message) { BroadcastChat(a_Message, mtInformation); } + void BroadcastChat (const cCompositeChat & a_Message); + void BroadcastChatDeath (const AString & a_Message) { BroadcastChat(a_Message, mtDeath); } void BroadcastChatFailure(const AString & a_Message) { BroadcastChat(a_Message, mtFailure); } - void BroadcastChatSuccess(const AString & a_Message) { BroadcastChat(a_Message, mtSuccess); } - void BroadcastChatWarning(const AString & a_Message) { BroadcastChat(a_Message, mtWarning); } void BroadcastChatFatal (const AString & a_Message) { BroadcastChat(a_Message, mtFailure); } + void BroadcastChatInfo (const AString & a_Message) { BroadcastChat(a_Message, mtInformation); } void BroadcastChatJoin (const AString & a_Message) { BroadcastChat(a_Message, mtJoin); } void BroadcastChatLeave (const AString & a_Message) { BroadcastChat(a_Message, mtLeave); } - void BroadcastChatDeath (const AString & a_Message) { BroadcastChat(a_Message, mtDeath); } - void BroadcastChat (const cCompositeChat & a_Message); + void BroadcastChatSuccess(const AString & a_Message) { BroadcastChat(a_Message, mtSuccess); } + void BroadcastChatWarning(const AString & a_Message) { BroadcastChat(a_Message, mtWarning); } /// Returns the textual description of the protocol version: 49 -> "1.4.4". Provided specifically for Lua API static AString GetProtocolVersionTextFromInt(int a_ProtocolVersionNum); |