aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2010-01-18 23:12:35 +0100
committerQAston <none@none>2010-01-18 23:12:35 +0100
commita1bbbd1421d29edd02feb2e19df8b07c9484f59d (patch)
tree7a64117ff17d3c44a0677ca05256366044c3ca3c /src/game/Player.cpp
parentc7c3b0edb06abbbbf5ffc54ed9e499a04e62c645 (diff)
*Cleanups before delete after not successfull load pet from db. Thanks to Drahy for debug traces.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index b1db9d75107..48e4901a9e0 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16462,7 +16462,10 @@ void Player::LoadPet()
{
Pet *pet = new Pet(this);
if (!pet->LoadPetFromDB(this,0,0,true))
+ {
+ pet->CleanupsBeforeDelete();
delete pet;
+ }
}
}
@@ -22455,7 +22458,10 @@ void Player::ResummonPetTemporaryUnSummonedIfAny()
Pet* NewPet = new Pet(this);
if(!NewPet->LoadPetFromDB(this, 0, m_temporaryUnsummonedPetNumber, true))
+ {
+ NewPet->CleanupsBeforeDelete();
delete NewPet;
+ }
m_temporaryUnsummonedPetNumber = 0;
}