Daniele Bartolini 11 yıl önce
ebeveyn
işleme
a7864c674e
2 değiştirilmiş dosya ile 4 ekleme ve 4 silme
  1. 2 1
      engine/lua/lua_environment.cpp
  2. 2 3
      engine/lua/lua_system.cpp

+ 2 - 1
engine/lua/lua_environment.cpp

@@ -46,8 +46,9 @@ LuaEnvironment::LuaEnvironment(lua_State* L)
 //-----------------------------------------------------------------------------
 void LuaEnvironment::execute(const LuaResource* lr)
 {
+	using namespace lua_resource;
 	lua_pushcfunction(_L, lua_system::error_handler);
-	luaL_loadbuffer(_L, (const char*) lr->program(), lr->size(), "<unknown>");
+	luaL_loadbuffer(_L, program(lr), size(lr), "<unknown>");
 	lua_pcall(_L, 0, 0, -2);
 	lua_pop(_L, 1);
 }

+ 2 - 3
engine/lua/lua_system.cpp

@@ -122,16 +122,15 @@ namespace lua_system
 	// Redirects require to the resource manager.
 	static int require(lua_State* L)
 	{
+		using namespace lua_resource;
 		LuaStack stack(L);
-
 		const char* filename = stack.get_string(1);
-
 		const ResourceId lua_res("lua", filename);
 		device()->resource_manager()->load(lua_res);
 		device()->resource_manager()->flush();
 
 		const LuaResource* lr = (LuaResource*) device()->resource_manager()->get(lua_res);
-		luaL_loadbuffer(L, (const char*) lr->program(), lr->size(), "");
+		luaL_loadbuffer(L, program(lr), size(lr), "");
 
 		device()->resource_manager()->unload(lua_res);