Add meshnode drawtype.

[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 ee3783bb9656e15e96f4f7a3925dd6e219ebba55..2fe7d8074fb481953dedf36325464d9c970a6319 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);
@@ -61,13 +61,16 @@ void ScriptApiEnv::environment_Step(float dtime)
 void ScriptApiEnv::player_event(ServerActiveObject* player, std::string type)
 {
        SCRIPTAPI_PRECHECKHEADER
+       
+       if (player == NULL)
+               return;
 
        // Get minetest.registered_playerevents
        lua_getglobal(L, "minetest");
        lua_getfield(L, -1, "registered_playerevents");
 
        // Call callbacks
-       objectrefGetOrCreate(player);   // player
+       objectrefGetOrCreate(L, player);   // player
        lua_pushstring(L,type.c_str()); // event type
        try {
                script_run_callbacks(L, 2, RUN_CALLBACKS_MODE_FIRST);
@@ -80,8 +83,8 @@ void ScriptApiEnv::environment_OnMapgenInit(MapgenParams *mgparams)
 {
        SCRIPTAPI_PRECHECKHEADER
        
-       // Get minetest.registered_on_mapgen_inits
-       lua_getglobal(L, "minetest");
+       // Get core.registered_on_mapgen_inits
+       lua_getglobal(L, "core");
        lua_getfield(L, -1, "registered_on_mapgen_inits");
 
        // Call callbacks
@@ -114,8 +117,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);