aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsilverice <none@none>2010-06-11 05:00:46 +0300
committersilverice <none@none>2010-06-11 05:00:46 +0300
commitd6d9d50952aa244dfeba4d4ce6219527602ff8d8 (patch)
tree8f9f2ca187778089591113439dce96eeaa45593f /src
parentd9d6e5732d0e07d6975e99ca32b146b9d6aa8944 (diff)
Fix some memory leaks
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AI/EventAI/CreatureEventAI.cpp10
-rw-r--r--src/server/game/AI/EventAI/CreatureEventAIMgr.cpp10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 47c8e9e6ad8..c6ec06d8895 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -1331,12 +1331,12 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
if ((*itr).Event.receive_emote.emoteId != text_emote)
return;
- Condition* cond = new Condition();
- cond->mConditionType = ConditionType((*itr).Event.receive_emote.condition);
- cond->mConditionValue1 = (*itr).Event.receive_emote.conditionValue1;
- cond->mConditionValue2 = (*itr).Event.receive_emote.conditionValue2;
+ Condition cond;
+ cond.mConditionType = ConditionType((*itr).Event.receive_emote.condition);
+ cond.mConditionValue1 = (*itr).Event.receive_emote.conditionValue1;
+ cond.mConditionValue2 = (*itr).Event.receive_emote.conditionValue2;
- if (cond->Meets(pPlayer))
+ if (cond.Meets(pPlayer))
{
sLog.outDebug("CreatureEventAI: ReceiveEmote CreatureEventAI: Condition ok, processing");
ProcessEvent(*itr, pPlayer);
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 57c23c9a26b..8c71f5e5765 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -362,11 +362,11 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
}
if (temp.receive_emote.condition)
{
- Condition* cond = new Condition();
- cond->mConditionType = ConditionType(temp.receive_emote.condition);
- cond->mConditionValue1 = temp.receive_emote.conditionValue1;
- cond->mConditionValue2 = temp.receive_emote.conditionValue2;
- if (!sConditionMgr.isConditionTypeValid(cond))
+ Condition cond;
+ cond.mConditionType = ConditionType(temp.receive_emote.condition);
+ cond.mConditionValue1 = temp.receive_emote.conditionValue1;
+ cond.mConditionValue2 = temp.receive_emote.conditionValue2;
+ if (!sConditionMgr.isConditionTypeValid(&cond))
{
sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: param2 (Condition: %u) are not valid.",temp.creature_id, i, temp.receive_emote.condition);
continue;