refactor: 'lua' namespace expansion

src/logic/scripting/lua/libitem.cpp

@@ -1,53 +1,43 @@
-#include "lua_commons.hpp"
-#include "lua_util.hpp"
 #include "api_lua.hpp"
-#include "LuaState.hpp"
-#include "../scripting.hpp"
+
 #include "../../../content/Content.hpp"
 #include "../../../items/ItemDef.hpp"
 
-namespace scripting {
-    extern lua::LuaState* state;
-}
 using namespace scripting;
 
 static int l_item_name(lua_State* L) {
     auto indices = content->getIndices();
-    auto id = lua_tointeger(L, 1);
+    auto id = lua::tointeger(L, 1);
     if (static_cast<size_t>(id) >= indices->countItemDefs()) {
         return 0;
     }
     auto def = indices->getItemDef(id);
-    lua_pushstring(L, def->name.c_str());
-    return 1;
+    return lua::pushstring(L, def->name);
 }
 
 static int l_item_index(lua_State* L) {
     auto name = lua::require_string(L, 1);
-    lua_pushinteger(L, content->requireItem(name).rt.id);
-    return 1;
+    return lua::pushinteger(L, content->requireItem(name).rt.id);
 }
 
 static int l_item_stack_size(lua_State* L) {
     auto indices = content->getIndices();
-    auto id = lua_tointeger(L, 1);
+    auto id = lua::tointeger(L, 1);
     if (static_cast<size_t>(id) >= indices->countItemDefs()) {
         return 0;
     }
     auto def = indices->getItemDef(id);
-    lua_pushinteger(L, def->stackSize);
-    return 1;
+    return lua::pushinteger(L, def->stackSize);
 }
 
 static int l_item_defs_count(lua_State* L) {
-    lua_pushinteger(L, scripting::indices->countItemDefs());
-    return 1;
+    return lua::pushinteger(L, indices->countItemDefs());
 }
 
 const luaL_Reg itemlib [] = {
-    {"index", lua_wrap_errors<l_item_index>},
-    {"name", lua_wrap_errors<l_item_name>},
-    {"stack_size", lua_wrap_errors<l_item_stack_size>},
-    {"defs_count", lua_wrap_errors<l_item_defs_count>},
+    {"index", lua::wrap<l_item_index>},
+    {"name", lua::wrap<l_item_name>},
+    {"stack_size", lua::wrap<l_item_stack_size>},
+    {"defs_count", lua::wrap<l_item_defs_count>},
     {NULL, NULL}
 };