summaryrefslogtreecommitdiffstats
path: root/src/game-server/item.h
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:09:23 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-05-08 14:02:51 +0200
commitcec65058123f710643290c13b7f2b0512b878381 (patch)
tree8130d69617e8da8f1920ae5538a0b5a2d8d1bfd5 /src/game-server/item.h
parent0a1332f04b841bc32e09552665e5cd611fa23ca8 (diff)
downloadmanaserv-cec65058123f710643290c13b7f2b0512b878381.tar.gz
manaserv-cec65058123f710643290c13b7f2b0512b878381.tar.xz
manaserv-cec65058123f710643290c13b7f2b0512b878381.zip
[Abilities] Removed the old autoattack system
As a side effect i had to remove the monster attack AI for now. I will readd this as next thing.
Diffstat (limited to 'src/game-server/item.h')
-rw-r--r--src/game-server/item.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/game-server/item.h b/src/game-server/item.h
index 7624209..e627b42 100644
--- a/src/game-server/item.h
+++ b/src/game-server/item.h
@@ -25,7 +25,6 @@
#include <vector>
#include "game-server/actor.h"
-#include "game-server/attack.h"
#include "scripting/script.h"
class Entity;
@@ -86,7 +85,6 @@ enum ItemEffectType
// Effects that are removed automatically when the trigger ends
// (ie. item no longer exists in invy, unequipped)
IET_ATTR_MOD = 0, // Modify a given attribute with a given value
- IET_ATTACK, // Give the associated being an attack
// Effects that do not need any automatic removal
IET_COOLDOWN, // Set a cooldown to this item, preventing activation for n ticks
IET_G_COOLDOWN, // Set a cooldown to all items of this type for this being
@@ -129,19 +127,6 @@ class ItemEffectAttrMod : public ItemEffectInfo
unsigned mId;
};
-class ItemEffectAttack : public ItemEffectInfo
-{
- public:
- ItemEffectAttack(AttackInfo *attackInfo) :
- mAttackInfo(attackInfo)
- {}
-
- bool apply(Entity *itemUser);
- void dispell(Entity *itemUser);
- private:
- AttackInfo *mAttackInfo;
-};
-
class ItemEffectConsumes : public ItemEffectInfo
{
public:
@@ -250,12 +235,6 @@ class ItemClass
Script::Ref getEventCallback(const std::string &event) const
{ return mEventCallbacks.value(event); }
- void addAttack(AttackInfo *attackInfo, ItemTriggerType applyTrigger,
- ItemTriggerType dispellTrigger);
-
- std::vector<AttackInfo *> &getAttackInfos()
- { return mAttackInfos; }
-
private:
/**
* Add an effect to a trigger
@@ -290,8 +269,6 @@ class ItemClass
*/
utils::NameMap<Script::Ref> mEventCallbacks;
- std::vector<AttackInfo *> mAttackInfos;
-
friend class ItemManager;
};