diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-01 23:12:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-01 23:12:21 +0100 |
| commit | 62adbdab992ec177f60dec76447508741de4e7db (patch) | |
| tree | f71d5970526fe06b04f6ba7953bec70f665aaf5e /src/server/game/Loot/LootMgr.cpp | |
| parent | 234f0971200a0d75db61b163afc433270bce632b (diff) | |
| parent | 01b705c84422902201a9ae51b1fb457f9f53d601 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
Diffstat (limited to 'src/server/game/Loot/LootMgr.cpp')
| -rw-r--r-- | src/server/game/Loot/LootMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 098fcc657b3..b1db7f6563f 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * This program is free software; you can redistribute it and/or modify it @@ -666,7 +666,7 @@ void Loot::DeleteLootItemFromContainerItemDB(uint32 itemID) // Mark the item looted to prevent resaving for (LootItemList::iterator _itr = items.begin(); _itr != items.end(); _itr++) { - if (!_itr->itemid == itemID) + if (_itr->itemid != itemID) continue; _itr->canSave = true; @@ -1272,7 +1272,7 @@ void LootTemplate::CopyConditions(LootItem* li) const // Copies the conditions list from a template item to a LootItem for (LootStoreItemList::const_iterator _iter = Entries.begin(); _iter != Entries.end(); ++_iter) { - if (!_iter->itemid == li->itemid) + if (_iter->itemid != li->itemid) continue; li->conditions = _iter->conditions; |