1 files changed, 16 insertions, 42 deletions

diff --git a/src/script/lua_api/l_settings.cpp b/src/script/lua_api/l_settings.cpp
index 3f3fda56e..e4d523070 100644
--- a/src/script/lua_api/l_settings.cpp
+++ b/src/script/lua_api/l_settings.cpp
@@ -115,7 +115,7 @@ int LuaSettings::gc_object(lua_State* L)
 int LuaSettings::l_get(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 	if (o->m_settings->exists(key)) {
@@ -132,7 +132,7 @@ int LuaSettings::l_get(lua_State* L)
 int LuaSettings::l_get_bool(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 	if (o->m_settings->exists(key)) {
@@ -153,7 +153,7 @@ int LuaSettings::l_get_bool(lua_State* L)
 int LuaSettings::l_get_np_group(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings *o = checkobject(L, 1);
+	LuaSettings *o = checkObject<LuaSettings>(L, 1);
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 	if (o->m_settings->exists(key)) {
@@ -171,7 +171,7 @@ int LuaSettings::l_get_np_group(lua_State *L)
 int LuaSettings::l_get_flags(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings *o = checkobject(L, 1);
+	LuaSettings *o = checkObject<LuaSettings>(L, 1);
 	std::string key = std::string(luaL_checkstring(L, 2));
 
 	u32 flags = 0;
@@ -195,7 +195,7 @@ int LuaSettings::l_get_flags(lua_State *L)
 int LuaSettings::l_set(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 	const char* value = luaL_checkstring(L, 3);
@@ -212,7 +212,7 @@ int LuaSettings::l_set(lua_State* L)
 int LuaSettings::l_set_bool(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 	bool value = readParam<bool>(L, 3);
@@ -228,7 +228,7 @@ int LuaSettings::l_set_bool(lua_State* L)
 int LuaSettings::l_set_np_group(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings *o = checkobject(L, 1);
+	LuaSettings *o = checkObject<LuaSettings>(L, 1);
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 	NoiseParams value;
@@ -245,7 +245,7 @@ int LuaSettings::l_set_np_group(lua_State *L)
 int LuaSettings::l_remove(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 
@@ -261,7 +261,7 @@ int LuaSettings::l_remove(lua_State* L)
 int LuaSettings::l_get_names(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	std::vector<std::string> keys = o->m_settings->getNames();
 
@@ -279,7 +279,7 @@ int LuaSettings::l_get_names(lua_State* L)
 int LuaSettings::l_write(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	if (!o->m_write_allowed) {
 		throw LuaError("Settings: writing " + o->m_filename +
@@ -318,7 +318,7 @@ static void push_settings_table(lua_State *L, const Settings *settings)
 int LuaSettings::l_to_table(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
+	LuaSettings* o = checkObject<LuaSettings>(L, 1);
 
 	MutexAutoLock(o->m_settings->m_mutex);
 	push_settings_table(L, o->m_settings);
@@ -328,27 +328,11 @@ int LuaSettings::l_to_table(lua_State* L)
 
 void LuaSettings::Register(lua_State* L)
 {
-	lua_newtable(L);
-	int methodtable = lua_gettop(L);
-	luaL_newmetatable(L, className);
-	int metatable = lua_gettop(L);
-
-	lua_pushliteral(L, "__metatable");
-	lua_pushvalue(L, methodtable);
-	lua_settable(L, metatable);  // hide metatable from Lua getmetatable()
-
-	lua_pushliteral(L, "__index");
-	lua_pushvalue(L, methodtable);
-	lua_settable(L, metatable);
-
-	lua_pushliteral(L, "__gc");
-	lua_pushcfunction(L, gc_object);
-	lua_settable(L, metatable);
-
-	lua_pop(L, 1);  // drop metatable
-
-	luaL_register(L, nullptr, methods);  // fill methodtable
-	lua_pop(L, 1);  // drop methodtable
+	static const luaL_Reg metamethods[] = {
+		{"__gc", gc_object},
+		{0, 0}
+	};
+	registerClass(L, className, methods, metamethods);
 
 	// Can be created from Lua (Settings(filename))
 	lua_register(L, className, create_object);
@@ -369,16 +353,6 @@ int LuaSettings::create_object(lua_State* L)
 	return 1;
 }
 
-LuaSettings* LuaSettings::checkobject(lua_State* L, int narg)
-{
-	NO_MAP_LOCK_REQUIRED;
-	luaL_checktype(L, narg, LUA_TUSERDATA);
-	void *ud = luaL_checkudata(L, narg, className);
-	if (!ud)
-		luaL_typerror(L, narg, className);
-	return *(LuaSettings**) ud;  // unbox pointer
-}
-
 const char LuaSettings::className[] = "Settings";
 const luaL_Reg LuaSettings::methods[] = {
 	luamethod(LuaSettings, get),