Expose mapgen chunksize in on_mapgen_init callbacks

[minetest.git] / src / script / cpp_api / s_env.cpp

diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
index b0de675ecfc9c4dfcef7a85452d3af5d99cce99d..916c562fbf2ca1b280b31abef6636bace931a072 100644 (file)
--- a/src/script/cpp_api/s_env.cpp
+++ b/src/script/cpp_api/s_env.cpp
@@ -31,8 +31,8 @@ void ScriptApiEnv::environment_OnGenerated(v3s16 minp, v3s16 maxp,
 {
        SCRIPTAPI_PRECHECKHEADER
 
-       // Get minetest.registered_on_generateds
-       lua_getglobal(L, "minetest");
+       // Get core.registered_on_generateds
+       lua_getglobal(L, "core");
        lua_getfield(L, -1, "registered_on_generateds");
        // Call callbacks
        push_v3s16(L, minp);
@@ -46,8 +46,8 @@ void ScriptApiEnv::environment_Step(float dtime)
        SCRIPTAPI_PRECHECKHEADER
        //infostream<<"scriptapi_environment_step"<<std::endl;
 
-       // Get minetest.registered_globalsteps
-       lua_getglobal(L, "minetest");
+       // Get core.registered_globalsteps
+       lua_getglobal(L, "core");
        lua_getfield(L, -1, "registered_globalsteps");
        // Call callbacks
        lua_pushnumber(L, dtime);
@@ -58,31 +58,55 @@ void ScriptApiEnv::environment_Step(float dtime)
        }
 }
 
-void ScriptApiEnv::environment_OnMapgenInit(MapgenParams *mgparams)
+void ScriptApiEnv::player_event(ServerActiveObject* player, std::string type)
 {
        SCRIPTAPI_PRECHECKHEADER
-       
-       // Get minetest.registered_on_mapgen_inits
+
+       if (player == NULL)
+               return;
+
+       // Get minetest.registered_playerevents
        lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_playerevents");
+
+       // Call callbacks
+       objectrefGetOrCreate(L, player);   // player
+       lua_pushstring(L,type.c_str()); // event type
+       try {
+               script_run_callbacks(L, 2, RUN_CALLBACKS_MODE_FIRST);
+       } catch (LuaError &e) {
+               getServer()->setAsyncFatalError(e.what());
+       }
+}
+
+void ScriptApiEnv::environment_OnMapgenInit(MapgenParams *mgparams)
+{
+       SCRIPTAPI_PRECHECKHEADER
+
+       // Get core.registered_on_mapgen_inits
+       lua_getglobal(L, "core");
        lua_getfield(L, -1, "registered_on_mapgen_inits");
 
        // Call callbacks
        lua_newtable(L);
-       
+
        lua_pushstring(L, mgparams->mg_name.c_str());
        lua_setfield(L, -2, "mgname");
-       
+
        lua_pushinteger(L, mgparams->seed);
        lua_setfield(L, -2, "seed");
-       
+
        lua_pushinteger(L, mgparams->water_level);
        lua_setfield(L, -2, "water_level");
-       
+
+       lua_pushinteger(L, mgparams->chunksize);
+       lua_setfield(L, -2, "chunksize");
+
        std::string flagstr = writeFlagString(mgparams->flags,
                flagdesc_mapgen, (u32)-1);
        lua_pushstring(L, flagstr.c_str());
        lua_setfield(L, -2, "flags");
-       
+
        script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
 }
 
@@ -96,8 +120,8 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
                Add ActiveBlockModifiers to environment
        */
 
-       // Get minetest.registered_abms
-       lua_getglobal(L, "minetest");
+       // Get core.registered_abms
+       lua_getglobal(L, "core");
        lua_getfield(L, -1, "registered_abms");
        luaL_checktype(L, -1, LUA_TTABLE);
        int registered_abms = lua_gettop(L);