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

Core/DBLayer: Proper code style on recently refactored code

Browse Source
This commit is contained in:
leak
2011-12-25 14:26:50 +01:00
parent 64a2a29506
commit 41888f63c9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
+9 -9
View File
@@ -693,25 +693,25 @@ void WorldSession::HandleUnstablePet(WorldPacket & recv_data)
_unstablePetCallback.SetFutureResult(CharacterDatabase.AsyncQuery(stmt));
}
void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32 petnumber)
void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32 petId)
{
if (!GetPlayer())
return;
uint32 creature_id = 0;
uint32 petEntry = 0;
if (result)
{
Field* fields = result->Fetch();
creature_id = fields[0].GetUInt32();
petEntry = fields[0].GetUInt32();
}
if (!creature_id)
if (!petEntry)
{
SendStableResult(STABLE_ERR_STABLE);
return;
}
CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(creature_id);
CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(petEntry);
if (!creatureInfo || !creatureInfo->isTameable(_player->CanTameExoticPets()))
{
// if problem in exotic pet
@@ -733,11 +733,11 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32
if (pet)
_player->RemovePet(pet, PET_SAVE_AS_DELETED);
Pet* newpet = new Pet(_player, HUNTER_PET);
if (!newpet->LoadPetFromDB(_player, creature_id, petnumber))
Pet* newPet = new Pet(_player, HUNTER_PET);
if (!newPet->LoadPetFromDB(_player, petEntry, petId))
{
delete newpet;
newpet = NULL;
delete newPet;
newPet = NULL;
SendStableResult(STABLE_ERR_STABLE);
return;
}
src/server/game/Server/WorldSession.h
+1 -1
View File
@@ -587,7 +587,7 @@ class WorldSession
void HandleStablePet(WorldPacket& recvPacket);
void HandleStablePetCallback(PreparedQueryResult result);
void HandleUnstablePet(WorldPacket& recvPacket);
void HandleUnstablePetCallback(PreparedQueryResult result, uint32 petnumber);
void HandleUnstablePetCallback(PreparedQueryResult result, uint32 petId);
void HandleBuyStableSlot(WorldPacket& recvPacket);
void HandleStableRevivePet(WorldPacket& recvPacket);
void HandleStableSwapPet(WorldPacket& recvPacket);