1 files changed, 0 insertions, 28 deletions
diff --git a/src/game-server/item.cpp b/src/game-server/item.cpp
index 444576f..589fc01 100644
--- a/src/game-server/item.cpp
+++ b/src/game-server/item.cpp
@@ -22,10 +22,8 @@
 #include "game-server/item.h"
 
 #include "common/configuration.h"
-#include "game-server/attack.h"
 #include "game-server/attributemanager.h"
 #include "game-server/being.h"
-#include "game-server/combatcomponent.h"
 #include "game-server/state.h"
 #include "scripting/script.h"
 #include "scripting/scriptmanager.h"
@@ -53,17 +51,6 @@ void ItemEffectAttrMod::dispell(Entity *itemUser)
                                                              mId, !mDuration);
 }
 
-bool ItemEffectAttack::apply(Entity *itemUser)
-{
-    itemUser->getComponent<CombatComponent>()->addAttack(mAttackInfo);
-    return false;
-}
-
-void ItemEffectAttack::dispell(Entity *itemUser)
-{
-    itemUser->getComponent<CombatComponent>()->removeAttack(mAttackInfo);
-}
-
 ItemEffectScript::~ItemEffectScript()
 {
 }
@@ -110,13 +97,6 @@ ItemClass::~ItemClass()
         delete mEffects.begin()->second;
         mEffects.erase(mEffects.begin());
     }
-
-    for (std::vector<AttackInfo *>::iterator it = mAttackInfos.begin(),
-         it_end = mAttackInfos.end();
-         it != it_end; ++it)
-    {
-        delete *it;
-    }
 }
 
 void ItemClass::addEffect(ItemEffectInfo *effect,
@@ -148,14 +128,6 @@ bool ItemClass::useTrigger(Entity *itemUser, ItemTriggerType trigger)
     return ret;
 }
 
-void ItemClass::addAttack(AttackInfo *attackInfo,
-                             ItemTriggerType applyTrigger,
-                             ItemTriggerType dispellTrigger)
-{
-    mAttackInfos.push_back(attackInfo);
-    addEffect(new ItemEffectAttack(attackInfo), applyTrigger, dispellTrigger);
-}
-
 ItemComponent::ItemComponent(ItemClass *type, int amount) :
     mType(type),
     mAmount(amount)