From a82654debd8fd00fec3f2024290876ab0d6dd175 Mon Sep 17 00:00:00 2001 From: leak Date: Thu, 28 Apr 2011 22:42:33 +0200 Subject: Core/ObjectMgr: Refactor sItemStorage --- src/server/game/Scripting/ScriptMgr.cpp | 2 +- src/server/game/Scripting/ScriptMgr.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Scripting') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 82197da0a81..7430f04f7fc 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -643,7 +643,7 @@ bool ScriptMgr::OnItemUse(Player* player, Item* item, SpellCastTargets const& ta return tmpscript->OnUse(player, item, targets); } -bool ScriptMgr::OnItemExpire(Player* player, ItemPrototype const* proto) +bool ScriptMgr::OnItemExpire(Player* player, ItemTemplate const* proto) { ASSERT(player); ASSERT(proto); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 80888204053..4064c8b08f6 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -63,7 +63,7 @@ class WorldObject; struct AchievementCriteriaData; struct AuctionEntry; struct Condition; -struct ItemPrototype; +struct ItemTemplate; struct OutdoorPvPData; #define VISIBLE_RANGE (166.0f) //MAX visible range (size of grid) @@ -389,7 +389,7 @@ class ItemScript : public ScriptObject virtual bool OnUse(Player* /*player*/, Item* /*item*/, SpellCastTargets const& /*targets*/) { return false; } // Called when the item expires (is destroyed). - virtual bool OnExpire(Player* /*player*/, ItemPrototype const* /*proto*/) { return false; } + virtual bool OnExpire(Player* /*player*/, ItemTemplate const* /*proto*/) { return false; } }; class CreatureScript : public ScriptObject, public UpdatableScript @@ -840,7 +840,7 @@ class ScriptMgr bool OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex, Item* target); bool OnQuestAccept(Player* player, Item* item, Quest const* quest); bool OnItemUse(Player* player, Item* item, SpellCastTargets const& targets); - bool OnItemExpire(Player* player, ItemPrototype const* proto); + bool OnItemExpire(Player* player, ItemTemplate const* proto); public: /* CreatureScript */ -- cgit v1.2.3