Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix build in some compilers by calling proper cctor of ObjectGuid

Browse Source
This commit is contained in:
DDuarte
2014-10-25 16:05:34 +01:00
parent f37e5b9afd
commit 5eb9fe1ea8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Chat/Channels/Channel.cpp
View File

@@ -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());

2
src/server/scripts/Commands/cs_ticket.cpp
View File

@@ -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);