From 8fe1d3fc2e4564fd30658c7008ef7a0e6161e2d3 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 14 Dec 2014 18:46:19 -0500 Subject: [PATCH] Expose mapgen chunksize in on_mapgen_init callbacks --- src/script/cpp_api/s_env.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp index 2fe7d8074..916c562fb 100644 --- a/src/script/cpp_api/s_env.cpp +++ b/src/script/cpp_api/s_env.cpp @@ -61,7 +61,7 @@ void ScriptApiEnv::environment_Step(float dtime) void ScriptApiEnv::player_event(ServerActiveObject* player, std::string type) { SCRIPTAPI_PRECHECKHEADER - + if (player == NULL) return; @@ -82,28 +82,31 @@ void ScriptApiEnv::player_event(ServerActiveObject* player, std::string type) 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); }