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/content_cao.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/content_cao.h')
| -rw-r--r-- | src/content_cao.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/content_cao.h b/src/content_cao.h index 69e2e54a2..31ccd04d4 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <map> #include "irrlichttypes_extrabloated.h" -#include "content_object.h" #include "clientobject.h" #include "object_properties.h" #include "itemgroup.h" @@ -115,7 +114,7 @@ public: return new GenericCAO(gamedef, env); } - inline u8 getType() const + inline ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_GENERIC; } |