josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit

Browse Source
This commit is contained in:
Shauren
2011-11-23 19:17:33 +01:00
parent f091360940
commit 358b33239a
30 changed files with 220 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
+3 -3
View File
@@ -107,9 +107,9 @@ bool AddonHandler::BuildAddonPacket(WorldPacket* Source, WorldPacket* Target)
*Target << uint8(unk1);
if (unk1)
{
uint8 unk2 = (crc != 0x4c1c776d); // If addon is Standard addon CRC
*Target << uint8(unk2);
if (unk2)
uint8 unk = (crc != 0x4c1c776d); // If addon is Standard addon CRC
*Target << uint8(unk);
if (unk)
Target->append(tdata, sizeof(tdata));
*Target << uint32(0);
src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+2 -2
View File
@@ -1409,9 +1409,9 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
}
CharacterDatabase.EscapeString(newname);
if (QueryResult result = CharacterDatabase.PQuery("SELECT name FROM characters WHERE guid ='%u'", GUID_LOPART(guid)))
if (QueryResult oldNameResult = CharacterDatabase.PQuery("SELECT name FROM characters WHERE guid ='%u'", GUID_LOPART(guid)))
{
std::string oldname = result->Fetch()[0].GetString();
std::string oldname = oldNameResult->Fetch()[0].GetString();
std::string IP_str = GetRemoteAddress();
sLog->outChar("Account: %d (IP: %s), Character[%s] (guid:%u) Customized to: %s", GetAccountId(), IP_str.c_str(), oldname.c_str(), GUID_LOPART(guid), newname.c_str());
}