diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/World.cpp | 16 | ||||
| -rw-r--r-- | src/game/World.h | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/game/World.cpp b/src/game/World.cpp index 387ce2655b2..52e8752afd7 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -83,16 +83,6 @@ float World::m_MaxVisibleDistanceInFlight = DEFAULT_VISIBILITY_DISTANCE; float World::m_VisibleUnitGreyDistance = 0; float World::m_VisibleObjectGreyDistance = 0; -// ServerMessages.dbc -enum ServerMessageType -{ - SERVER_MSG_SHUTDOWN_TIME = 1, - SERVER_MSG_RESTART_TIME = 2, - SERVER_MSG_STRING = 3, - SERVER_MSG_SHUTDOWN_CANCELLED = 4, - SERVER_MSG_RESTART_CANCELLED = 5 -}; - struct ScriptAction { uint64 sourceGUID; @@ -3010,7 +3000,7 @@ void World::ShutdownMsg(bool show, Player* player) { std::string str = secsToTimeString(m_ShutdownTimer); - uint32 msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_TIME : SERVER_MSG_SHUTDOWN_TIME; + ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_TIME : SERVER_MSG_SHUTDOWN_TIME; SendServerMessage(msgid,str.c_str(),player); DEBUG_LOG("Server is %s in %s",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"),str.c_str()); @@ -3024,7 +3014,7 @@ void World::ShutdownCancel() if(!m_ShutdownTimer || m_stopEvent) return; - uint32 msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_CANCELLED : SERVER_MSG_SHUTDOWN_CANCELLED; + ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_CANCELLED : SERVER_MSG_SHUTDOWN_CANCELLED; m_ShutdownMask = 0; m_ShutdownTimer = 0; @@ -3035,7 +3025,7 @@ void World::ShutdownCancel() } /// Send a server message to the user(s) -void World::SendServerMessage(uint32 type, const char *text, Player* player) +void World::SendServerMessage(ServerMessageType type, const char *text, Player* player) { WorldPacket data(SMSG_SERVER_MESSAGE, 50); // guess size data << uint32(type); diff --git a/src/game/World.h b/src/game/World.h index 7ab378b8927..1200a868201 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -45,6 +45,16 @@ class SqlResultQueue; class QueryResult; class WorldSocket; +// ServerMessages.dbc +enum ServerMessageType +{ + SERVER_MSG_SHUTDOWN_TIME = 1, + SERVER_MSG_RESTART_TIME = 2, + SERVER_MSG_STRING = 3, + SERVER_MSG_SHUTDOWN_CANCELLED = 4, + SERVER_MSG_RESTART_CANCELLED = 5 +}; + enum ShutdownMask { SHUTDOWN_MASK_RESTART = 1, @@ -475,7 +485,7 @@ class World void SendGlobalGMMessage(WorldPacket *packet, WorldSession *self = 0, uint32 team = 0); void SendZoneMessage(uint32 zone, WorldPacket *packet, WorldSession *self = 0, uint32 team = 0); void SendZoneText(uint32 zone, const char *text, WorldSession *self = 0, uint32 team = 0); - void SendServerMessage(uint32 type, const char *text = "", Player* player = NULL); + void SendServerMessage(ServerMessageType type, const char *text = "", Player* player = NULL); /// Are we in the middle of a shutdown? bool IsShutdowning() const { return m_ShutdownTimer > 0; } |