X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Factiveobject.h;h=c46ae61b2a980987a258e45895713f928e2a2bb2;hb=08a10b8a6a77eb729d609979ee822134d5d7a645;hp=1a16aa0c43b5a890c7d2585e66d44c7804607b68;hpb=e4f7f97e6c79cda72dec7cd6fea5b85328b75894;p=dragonfireclient.git diff --git a/src/activeobject.h b/src/activeobject.h index 1a16aa0c4..c46ae61b2 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -20,9 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef ACTIVEOBJECT_HEADER #define ACTIVEOBJECT_HEADER -#include "common_irrlicht.h" +#include "irrlichttypes.h" #include +#define ACTIVEOBJECT_TYPE_INVALID 0 +// Other types are defined in content_object.h + struct ActiveObjectMessage { ActiveObjectMessage(u16 id_, bool reliable_=true, std::string data_=""): @@ -36,9 +39,6 @@ struct ActiveObjectMessage std::string datastring; }; -#define ACTIVEOBJECT_TYPE_INVALID 0 -#define ACTIVEOBJECT_TYPE_TEST 1 - /* Parent class for ServerActiveObject and ClientActiveObject */