X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Factiveobject.h;h=46880fc7feb10819a775bc9c0cbee0ce8e7a0fb9;hb=55c646c5c2b40931d24be8541b3056ab3322a70f;hp=e454f2c8c8da0d8c27bd3bf805363c78fa6637ef;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=oweals%2Fminetest.git diff --git a/src/activeobject.h b/src/activeobject.h index e454f2c8c..46880fc7f 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef ACTIVEOBJECT_HEADER #define ACTIVEOBJECT_HEADER -#include "irrlichttypes_bloated.h" +#include "irr_aabb3d.h" #include #define ACTIVEOBJECT_TYPE_INVALID 0 @@ -61,7 +61,8 @@ public: } virtual u8 getType() const = 0; - + virtual bool getCollisionBox(aabb3f *toset) = 0; + virtual bool collideWithObjects() = 0; protected: u16 m_id; // 0 is invalid, "no id" };