diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-16 17:42:13 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-17 09:09:50 +0100 |
| commit | f8d5af753617d502920556cff88f451ef670c210 (patch) | |
| tree | 885cb89cd4671e9a55a4d5e7246801748f2f848b /src/activeobject.h | |
| parent | 98d80e2012ab4856b8b443ef498297e3d3eadbaa (diff) | |
| download | minetest-f8d5af753617d502920556cff88f451ef670c210.tar.gz minetest-f8d5af753617d502920556cff88f451ef670c210.tar.bz2 minetest-f8d5af753617d502920556cff88f451ef670c210.zip | |
SAO work: ActiveObject types & SAO cleanup * Replace u8 types with ActiveObjectType. * Merge content_object.h into activeobject.h * Remove DummyLoadSAO, it's now unused. * Remove ItemSAO, it's also unused
Diffstat (limited to 'src/activeobject.h')
| -rw-r--r-- | src/activeobject.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/activeobject.h b/src/activeobject.h index 46880fc7f..3dd1f98f5 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -23,7 +23,16 @@ 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, + ACTIVEOBJECT_TYPE_ITEM = 2, + 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 +69,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: |