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

fixed some loot condition reload bugs

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Rat
2010-06-25 16:38:02 +02:00
parent 711c12a68e
commit f01ef873fb
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Loot/LootMgr.cpp
+3 -6
View File
@@ -188,7 +188,6 @@ bool LootStore::HaveQuestLootForPlayer(uint32 loot_id,Player* player) const
void LootStore::ResetConditions() void LootStore::ResetConditions()
{ {
LootTemplateMap m_LootTemplates;
for (LootTemplateMap::iterator itr = m_LootTemplates.begin(); itr != m_LootTemplates.end(); ++itr) for (LootTemplateMap::iterator itr = m_LootTemplates.begin(); itr != m_LootTemplates.end(); ++itr)
{ {
ConditionList empty; ConditionList empty;
@@ -969,11 +968,11 @@ void LootTemplate::LootGroup::CopyConditions(ConditionList conditions)
{ {
for (LootStoreItemList::iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i) for (LootStoreItemList::iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
{ {
i->conditions = conditions; i->conditions.clear();
} }
for (LootStoreItemList::iterator i = EqualChanced.begin(); i != EqualChanced.end(); ++i) for (LootStoreItemList::iterator i = EqualChanced.begin(); i != EqualChanced.end(); ++i)
{ {
i->conditions = conditions; i->conditions.clear();
} }
} }
@@ -1146,7 +1145,7 @@ void LootTemplate::AddEntry(LootStoreItem& item)
void LootTemplate::CopyConditions(ConditionList conditions) void LootTemplate::CopyConditions(ConditionList conditions)
{ {
for (LootStoreItemList::iterator i = Entries.begin(); i != Entries.end(); ++i) for (LootStoreItemList::iterator i = Entries.begin(); i != Entries.end(); ++i)
i->conditions = conditions; i->conditions.clear();
for (LootGroups::iterator i = Groups.begin(); i != Groups.end(); ++i) for (LootGroups::iterator i = Groups.begin(); i != Groups.end(); ++i)
i->CopyConditions(conditions); i->CopyConditions(conditions);
@@ -1197,8 +1196,6 @@ void LootTemplate::Process(Loot& loot, LootStore const& store, bool rate, uint16
if (!Referenced) if (!Referenced)
continue; // Error message already printed at loading stage continue; // Error message already printed at loading stage
const_cast<LootTemplate*>(Referenced)->CopyConditions(i->conditions);//copy conditions from referer template
for (uint32 loop = 0; loop < i->maxcount; ++loop) // Ref multiplicator for (uint32 loop = 0; loop < i->maxcount; ++loop) // Ref multiplicator
Referenced->Process(loot, store, rate, lootMode, i->group); Referenced->Process(loot, store, rate, lootMode, i->group);
} }