summaryrefslogtreecommitdiff
path: root/src/game-server/triggerareacomponent.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-18 22:24:38 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-03-25 20:32:36 +0100
commit7aee56f062989c8901322a09b2da40bb028eb222 (patch)
tree2c3712c3926121d35b0ef569e1eeed8f42e34b32 /src/game-server/triggerareacomponent.h
parent8ebd7ef2c200009e6d22b2cfaa3dd0d849155db6 (diff)
downloadmanaserv-7aee56f062989c8901322a09b2da40bb028eb222.tar.gz
manaserv-7aee56f062989c8901322a09b2da40bb028eb222.tar.bz2
manaserv-7aee56f062989c8901322a09b2da40bb028eb222.tar.xz
manaserv-7aee56f062989c8901322a09b2da40bb028eb222.zip
Changed Item to a component of Actor
Items also have positions, so the ItemComponent only makes sense as part of an Actor. Later on it will probably be part of an entity that also has an ActorComponent. Since it was annoying to update all the places where items were created, I've introduced a function for this. The component types are now prefixed with "CT_" because I wanted to introduce an 'Item' namespace which would otherwise be conflicting. The component types enum isn't used much in the code so it can look a bit ugly. Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/game-server/triggerareacomponent.h')
-rw-r--r--src/game-server/triggerareacomponent.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game-server/triggerareacomponent.h b/src/game-server/triggerareacomponent.h
index 4fa6e334..2185d8cf 100644
--- a/src/game-server/triggerareacomponent.h
+++ b/src/game-server/triggerareacomponent.h
@@ -66,7 +66,7 @@ class ScriptAction : public TriggerAction
class TriggerAreaComponent : public Component
{
public:
- static const ComponentType type = TriggerArea;
+ static const ComponentType type = CT_TriggerArea;
/**
* Creates a rectangular trigger for a given map.