From a1eaf1af6f902093ac551b6f06a1630c3e7e8e6f Mon Sep 17 00:00:00 2001 From: zhenya Date: Tue, 3 Feb 2009 02:00:55 +0300 Subject: [PATCH] [7225] Correctly clear trainer and vendor data. Signed-off-by: VladimirMangos --- src/game/Creature.cpp | 2 +- src/game/Creature.h | 1 + src/shared/revision_nr.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 85c4eff67..336f5ebc2 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -50,7 +50,7 @@ void TrainerSpellData::Clear() { for (TrainerSpellList::iterator itr = spellList.begin(); itr != spellList.end(); ++itr) delete (*itr); - spellList.empty(); + spellList.clear(); } TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const diff --git a/src/game/Creature.h b/src/game/Creature.h index 0aafaf84a..74c0f238c 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -340,6 +340,7 @@ struct VendorItemData { for (VendorItemList::iterator itr = m_items.begin(); itr != m_items.end(); ++itr) delete (*itr); + m_items.clear(); } }; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8953a4ce6..2fe20d964 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7224" + #define REVISION_NR "7225" #endif // __REVISION_NR_H__