Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu

[dragonfireclient.git] / src / script / lua_api / l_env.h

diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h
index 4122fd037ebc5da868222fcdbe6ec93232312f0b..adb80a8a833dd7628aba62a9ff810f7cd9aaaa1d 100644 (file)
--- a/src/script/lua_api/l_env.h
+++ b/src/script/lua_api/l_env.h
@@ -20,17 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef L_ENV_H_
 #define L_ENV_H_
 
-extern "C" {
-#include <lua.h>
-#include <lauxlib.h>
-}
-
-#include "environment.h"
 #include "lua_api/l_base.h"
+#include "environment.h"
 
-class ModApiEnvMod
-       :public ModApiBase
-{
+class ModApiEnvMod : public ModApiBase {
 private:
        // minetest.set_node(pos, node)
        // pos = {x=num, y=num, z=num}
@@ -131,14 +124,6 @@ class ModApiEnvMod
        // returns world-specific voxel manipulator
        static int l_get_voxel_manip(lua_State *L);
        
-       // minetest.get_mapgen_object(objectname)
-       // returns the requested object used during map generation
-       static int l_get_mapgen_object(lua_State *L);
-       
-       // minetest.set_mapgen_params(params)
-       // set mapgen parameters
-       static int l_set_mapgen_params(lua_State *L);
-
        // minetest.clear_objects()
        // clear all objects in the environment
        static int l_clear_objects(lua_State *L);
@@ -159,10 +144,8 @@ class ModApiEnvMod
        static int l_get_heat(lua_State *L);
        static int l_get_humidity(lua_State *L);
        
-       static struct EnumString es_MapgenObject[];
-       
 public:
-       bool Initialize(lua_State *L, int top);
+       static void Initialize(lua_State *L, int top);
 };
 
 class LuaABM : public ActiveBlockModifier