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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/content_cao.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 6d41b2749..4994c8b20 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -34,7 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "serialization.h" // For decompressZlib #include "gamedef.h" #include "clientobject.h" -#include "content_object.h" #include "mesh.h" #include "itemdef.h" #include "tool.h" @@ -145,7 +144,7 @@ public: TestCAO(IGameDef *gamedef, ClientEnvironment *env); virtual ~TestCAO(); - u8 getType() const + ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_TEST; } @@ -289,7 +288,7 @@ public: ItemCAO(IGameDef *gamedef, ClientEnvironment *env); virtual ~ItemCAO(); - u8 getType() const + ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_ITEM; } |