Merge pull request #29 from cisoun/master

[minetest.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index 041be0778b8f6d42abeee1d024aeeb9699bf7f26..09ee23a14c61bec788c2a9e8d9cabd8c14b25698 100644 (file)
--- 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 <string>
 
+#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,10 +39,6 @@ struct ActiveObjectMessage
        std::string datastring;
 };
 
-#define ACTIVEOBJECT_TYPE_INVALID 0
-#define ACTIVEOBJECT_TYPE_TEST 1
-#define ACTIVEOBJECT_TYPE_ITEM 2
-
 /*
        Parent class for ServerActiveObject and ClientActiveObject
 */