diff options
author | DDuarte <dnpd.dd@gmail.com> | 2014-10-25 16:05:34 +0100 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-25 16:05:34 +0100 |
commit | 5eb9fe1ea8653c7ae23e4a8c2fa9f8f3073e032d (patch) | |
tree | fed255664e37ecce51370a4e19430c0052bc4864 | |
parent | f37e5b9afd6b9d45afaf2c951d4fac0b72832865 (diff) |
Core: Fix build in some compilers by calling proper cctor of ObjectGuid
-rw-r--r-- | src/server/game/Chat/Channels/Channel.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_ticket.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index d69230183a8..a25e292b15b 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -81,7 +81,7 @@ Channel::Channel(std::string const& name, uint32 channelId, uint32 team): for (Tokenizer::const_iterator i = tokens.begin(); i != tokens.end(); ++i) { std::string bannedGuidStr(*i); - ObjectGuid banned_guid(uint64(strtoull(bannedGuidStr.substr(0, 16).c_str(), NULL, 16)), uint64(strtoull(bannedGuidStr.substr(16).c_str(), NULL, 16))); + ObjectGuid banned_guid(HIGHGUID_PLAYER, uint64(strtoull(bannedGuidStr.substr(0, 16).c_str(), NULL, 16)), uint64(strtoull(bannedGuidStr.substr(16).c_str(), NULL, 16))); if (!banned_guid.IsEmpty()) { TC_LOG_DEBUG("chat.system", "Channel(%s) loaded bannedStore %s", name.c_str(), banned_guid.ToString().c_str()); diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index 3e2c11e2ddd..97d96d90744 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -153,7 +153,7 @@ public: return true; } - sTicketMgr->CloseTicket(ticket->GetId(), player ? player->GetGUID() : ObjectGuid(uint64(0), uint64(-1))); + sTicketMgr->CloseTicket(ticket->GetId(), player ? player->GetGUID() : ObjectGuid(HIGHGUID_PLAYER, uint64(0), uint64(-1))); sTicketMgr->UpdateLastChange(); std::string msg = ticket->FormatMessageString(*handler, player ? player->GetName().c_str() : "Console", NULL, NULL, NULL, NULL); |