diff options
| author | leak <leakzx@googlemail.com> | 2011-04-28 22:42:33 +0200 |
|---|---|---|
| committer | leak <leakzx@googlemail.com> | 2011-04-28 22:42:33 +0200 |
| commit | a82654debd8fd00fec3f2024290876ab0d6dd175 (patch) | |
| tree | 034e8ac183c66fe28e3823484e2a85e99c4b6114 /src/server/scripts/World | |
| parent | 03365e9a573667f5485f44642b47b05473094474 (diff) | |
Core/ObjectMgr: Refactor sItemStorage
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/item_scripts.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_professions.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 71c3a1661ed..c248738a6d6 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -189,7 +189,7 @@ class item_mysterious_egg : public ItemScript { public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player *pPlayer, ItemPrototype const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -209,7 +209,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") {} - bool OnExpire(Player *pPlayer, ItemPrototype const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 314b781e773..798ca9a86e4 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -233,10 +233,10 @@ bool EquippedOk(Player* pPlayer, uint32 spellId) { pItem = pPlayer->GetItemByPos(INVENTORY_SLOT_BAG_0, j); if (pItem) - if (pItem->GetProto()->RequiredSpell == reqSpell) + if (pItem->GetTemplate()->RequiredSpell == reqSpell) { //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetTemplate()->ItemId); return false; } } |