reorganized a lot of stuff and modified mapgen and objects slightly while doing it

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,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
 */