diff options
Diffstat (limited to 'src/activeobject.h')
| -rw-r--r-- | src/activeobject.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/activeobject.h b/src/activeobject.h index 46880fc7f..48f078d3f 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -23,7 +23,22 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irr_aabb3d.h" #include <string> -#define ACTIVEOBJECT_TYPE_INVALID 0 +enum ActiveObjectType { + ACTIVEOBJECT_TYPE_INVALID = 0, + ACTIVEOBJECT_TYPE_TEST = 1, +// Deprecated stuff + ACTIVEOBJECT_TYPE_ITEM = 2, + ACTIVEOBJECT_TYPE_RAT = 3, + ACTIVEOBJECT_TYPE_OERKKI1 = 4, + ACTIVEOBJECT_TYPE_FIREFLY = 5, + ACTIVEOBJECT_TYPE_MOBV2 = 6, +// End deprecated stuff + ACTIVEOBJECT_TYPE_LUAENTITY = 7, +// Special type, not stored as a static object + ACTIVEOBJECT_TYPE_PLAYER = 100, +// Special type, only exists as CAO + ACTIVEOBJECT_TYPE_GENERIC = 101, +}; // Other types are defined in content_object.h struct ActiveObjectMessage @@ -60,7 +75,7 @@ public: m_id = id; } - virtual u8 getType() const = 0; + virtual ActiveObjectType getType() const = 0; virtual bool getCollisionBox(aabb3f *toset) = 0; virtual bool collideWithObjects() = 0; protected: |