diff options
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; } |