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

Core/Handler: Do now use dynamic memory allocation in character creation

Browse Source
This commit is contained in:
Spp-
2011-09-06 10:41:10 +02:00
parent b7882e0fa8
commit 4560991144
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+10 -12
View File
@@ -636,12 +636,11 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte
sLog->outDebug(LOG_FILTER_NETWORKIO, "Character creation %s (account %u) has unhandled tail data: [%u]", createInfo->Name.c_str(), GetAccountId(), unk); sLog->outDebug(LOG_FILTER_NETWORKIO, "Character creation %s (account %u) has unhandled tail data: [%u]", createInfo->Name.c_str(), GetAccountId(), unk);
} }
Player* pNewChar = new Player(this); Player newChar(this);
if (!pNewChar->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_PLAYER), createInfo)) if (!newChar.Create(sObjectMgr->GenerateLowGuid(HIGHGUID_PLAYER), createInfo))
{ {
// Player not create (race/class/etc problem?) // Player not create (race/class/etc problem?)
pNewChar->CleanupsBeforeDelete(); newChar.CleanupsBeforeDelete();
delete pNewChar;
WorldPacket data(SMSG_CHAR_CREATE, 1); WorldPacket data(SMSG_CHAR_CREATE, 1);
data << uint8(CHAR_CREATE_ERROR); data << uint8(CHAR_CREATE_ERROR);
@@ -653,12 +652,12 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte
} }
if ((haveSameRace && skipCinematics == 1) || skipCinematics == 2) if ((haveSameRace && skipCinematics == 1) || skipCinematics == 2)
pNewChar->setCinematic(1); // not show intro newChar.setCinematic(1); // not show intro
pNewChar->SetAtLoginFlag(AT_LOGIN_FIRST); // First login newChar.SetAtLoginFlag(AT_LOGIN_FIRST); // First login
// Player created, save it now // Player created, save it now
pNewChar->SaveToDB(); newChar.SaveToDB();
createInfo->CharCount += 1; createInfo->CharCount += 1;
SQLTransaction trans = LoginDatabase.BeginTransaction(); SQLTransaction trans = LoginDatabase.BeginTransaction();
@@ -676,18 +675,17 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte
LoginDatabase.CommitTransaction(trans); LoginDatabase.CommitTransaction(trans);
pNewChar->CleanupsBeforeDelete(); newChar.CleanupsBeforeDelete();
WorldPacket data(SMSG_CHAR_CREATE, 1); WorldPacket data(SMSG_CHAR_CREATE, 1);
data << uint8(CHAR_CREATE_SUCCESS); data << uint8(CHAR_CREATE_SUCCESS);
SendPacket(&data); SendPacket(&data);
std::string IP_str = GetRemoteAddress(); std::string IP_str = GetRemoteAddress();
sLog->outDetail("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), pNewChar->GetGUIDLow()); sLog->outDetail("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow());
sLog->outChar("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), pNewChar->GetGUIDLow()); sLog->outChar("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow());
sScriptMgr->OnPlayerCreate(pNewChar); sScriptMgr->OnPlayerCreate(&newChar);
delete pNewChar; // created only to call SaveToDB()
delete createInfo; delete createInfo;
_charCreateCallback.SetParam(NULL); _charCreateCallback.SetParam(NULL);
_charCreateCallback.FreeResult(); _charCreateCallback.FreeResult();