From 9e100bc42b5275299020ea8619e64f2e4aa76192 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 27 Jun 2013 22:33:31 -0400 Subject: Apply various fixes to several things --- src/script/lua_api/l_vmanip.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/script/lua_api/l_vmanip.cpp') diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp index f753f5f27..8bf65a555 100644 --- a/src/script/lua_api/l_vmanip.cpp +++ b/src/script/lua_api/l_vmanip.cpp @@ -88,7 +88,7 @@ int LuaVoxelManip::l_set_data(lua_State *L) int volume = vm->m_area.getVolume(); for (int i = 0; i != volume; i++) { lua_rawgeti(L, 2, i + 1); - content_t c = lua_tonumber(L, -1); + content_t c = lua_tointeger(L, -1); vm->m_data[i].setContent(c); @@ -224,7 +224,11 @@ int LuaVoxelManip::create_object(lua_State *L) { NO_MAP_LOCK_REQUIRED; - Map *map = &(get_scriptapi(L)->getEnv()->getMap()); + Environment *env = get_scriptapi(L)->getEnv(); + if (!env) + return 0; + + Map *map = &(env->getMap()); LuaVoxelManip *o = new LuaVoxelManip(map); *(void **)(lua_newuserdata(L, sizeof(void *))) = o; -- cgit v1.2.3