diff options
author | Brian <runningnak3d@gmail.com> | 2010-04-05 14:42:40 -0600 |
---|---|---|
committer | Brian <runningnak3d@gmail.com> | 2010-04-05 14:42:40 -0600 |
commit | 96cc2b1d48618d04dd866d786d98dcd8e8aef0c9 (patch) | |
tree | 454de929db3ea31505422c7bd19c74e4342bb632 /src/game/ObjectMgr.cpp | |
parent | ce1280627d7f075ec7cbd54182089714086f808e (diff) |
* Backed out changeset 44ff24439269
* We will implement this in a generic way using the conditions system
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
-rw-r--r-- | src/game/ObjectMgr.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 28b968fe44e..c449267e5f5 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -2422,7 +2422,7 @@ void ObjectMgr::LoadItemRequiredTarget() uint32 count = 0; - QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry,type,targetEntry,maxPercentHealth FROM item_required_target"); + QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry,type,targetEntry FROM item_required_target"); if (!result) { @@ -2442,10 +2442,9 @@ void ObjectMgr::LoadItemRequiredTarget() Field *fields = result->Fetch(); bar.step(); - uint32 uiItemId = fields[0].GetUInt32(); - uint32 uiType = fields[1].GetUInt32(); - uint32 uiTargetEntry = fields[2].GetUInt32(); - float uiMaxPercentHealth = fields[3].GetUInt32(); + uint32 uiItemId = fields[0].GetUInt32(); + uint32 uiType = fields[1].GetUInt32(); + uint32 uiTargetEntry = fields[2].GetUInt32(); ItemPrototype const* pItemProto = sItemStorage.LookupEntry<ItemPrototype>(uiItemId); @@ -2509,7 +2508,7 @@ void ObjectMgr::LoadItemRequiredTarget() continue; } - m_ItemRequiredTarget.insert(ItemRequiredTargetMap::value_type(uiItemId,ItemRequiredTarget(ItemRequiredTargetType(uiType),uiTargetEntry,uiMaxPercentHealth))); + m_ItemRequiredTarget.insert(ItemRequiredTargetMap::value_type(uiItemId,ItemRequiredTarget(ItemRequiredTargetType(uiType),uiTargetEntry))); ++count; } while (result->NextRow()); |