X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Factiveobject.h;h=09ee23a14c61bec788c2a9e8d9cabd8c14b25698;hb=6505bae4147dbccb70acfeb894a217d0dcc3f048;hp=382f7f7981d329a3b751da08e44362b5f3a50df2;hpb=c638442e78b953556e7dadd4c0c34cb0c719bbc8;p=minetest.git diff --git a/src/activeobject.h b/src/activeobject.h index 382f7f798..09ee23a14 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -23,6 +23,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.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,12 +39,6 @@ struct ActiveObjectMessage std::string datastring; }; -#define ACTIVEOBJECT_TYPE_INVALID 0 -#define ACTIVEOBJECT_TYPE_TEST 1 -#define ACTIVEOBJECT_TYPE_ITEM 2 -#define ACTIVEOBJECT_TYPE_RAT 3 -#define ACTIVEOBJECT_TYPE_OERKKI1 4 - /* Parent class for ServerActiveObject and ClientActiveObject */