Add Client::getEnv() and remove some unnecessary wrappers

[minetest.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index 103d90d12949b8cc190ed4ed7a399176f33bb41d..c46ae61b2a980987a258e45895713f928e2a2bb2 100644 (file)
--- 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 <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_LUA 2
-
 /*
        Parent class for ServerActiveObject and ClientActiveObject
 */