Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make NodeMetaRef::getmeta a non-static member

Browse Source
This commit is contained in:
rubenwardy 2017-01-31 16:18:45 +00:00
parent bbdd869d72
commit 13f94ecad5
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/script/lua_api/l_nodemeta.cpp
View File

@ -36,12 +36,12 @@ NodeMetaRef* NodeMetaRef::checkobject(lua_State *L, int narg)
return *(NodeMetaRef**)ud; // unbox pointer return *(NodeMetaRef**)ud; // unbox pointer
} }
NodeMetadata* NodeMetaRef::getmeta(NodeMetaRef *ref, bool auto_create) NodeMetadata* NodeMetaRef::getmeta(bool auto_create)
{ {
NodeMetadata *meta = ref->m_env->getMap().getNodeMetadata(ref->m_p); NodeMetadata *meta = m_env->getMap().getNodeMetadata(m_p);
if(meta == NULL && auto_create) { if (meta == NULL && auto_create) {
meta = new NodeMetadata(ref->m_env->getGameDef()->idef()); meta = new NodeMetadata(m_env->getGameDef()->idef());
if(!ref->m_env->getMap().setNodeMetadata(ref->m_p, meta)) { if (!m_env->getMap().setNodeMetadata(m_p, meta)) {
delete meta; delete meta;
return NULL; return NULL;
} }
@ -83,7 +83,7 @@ int NodeMetaRef::l_get_string(lua_State *L)
NodeMetaRef *ref = checkobject(L, 1); NodeMetaRef *ref = checkobject(L, 1);
std::string name = luaL_checkstring(L, 2); std::string name = luaL_checkstring(L, 2);
NodeMetadata *meta = getmeta(ref, false); NodeMetadata *meta = ref->getmeta(false);
if(meta == NULL){ if(meta == NULL){
lua_pushlstring(L, "", 0); lua_pushlstring(L, "", 0);
return 1; return 1;
@ -104,7 +104,7 @@ int NodeMetaRef::l_set_string(lua_State *L)
const char *s = lua_tolstring(L, 3, &len); const char *s = lua_tolstring(L, 3, &len);
std::string str(s, len); std::string str(s, len);
NodeMetadata *meta = getmeta(ref, !str.empty()); NodeMetadata *meta = ref->getmeta(!str.empty());
if(meta == NULL || str == meta->getString(name)) if(meta == NULL || str == meta->getString(name))
return 0; return 0;
meta->setString(name, str); meta->setString(name, str);
@ -120,7 +120,7 @@ int NodeMetaRef::l_get_int(lua_State *L)
NodeMetaRef *ref = checkobject(L, 1); NodeMetaRef *ref = checkobject(L, 1);
std::string name = lua_tostring(L, 2); std::string name = lua_tostring(L, 2);
NodeMetadata *meta = getmeta(ref, false); NodeMetadata *meta = ref->getmeta(false);
if(meta == NULL){ if(meta == NULL){
lua_pushnumber(L, 0); lua_pushnumber(L, 0);
return 1; return 1;
@ -140,7 +140,7 @@ int NodeMetaRef::l_set_int(lua_State *L)
int a = lua_tointeger(L, 3); int a = lua_tointeger(L, 3);
std::string str = itos(a); std::string str = itos(a);
NodeMetadata *meta = getmeta(ref, true); NodeMetadata *meta = ref->getmeta(true);
if(meta == NULL || str == meta->getString(name)) if(meta == NULL || str == meta->getString(name))
return 0; return 0;
meta->setString(name, str); meta->setString(name, str);
@ -156,7 +156,7 @@ int NodeMetaRef::l_get_float(lua_State *L)
NodeMetaRef *ref = checkobject(L, 1); NodeMetaRef *ref = checkobject(L, 1);
std::string name = lua_tostring(L, 2); std::string name = lua_tostring(L, 2);
NodeMetadata *meta = getmeta(ref, false); NodeMetadata *meta = ref->getmeta(false);
if(meta == NULL){ if(meta == NULL){
lua_pushnumber(L, 0); lua_pushnumber(L, 0);
return 1; return 1;
@ -176,7 +176,7 @@ int NodeMetaRef::l_set_float(lua_State *L)
float a = lua_tonumber(L, 3); float a = lua_tonumber(L, 3);
std::string str = ftos(a); std::string str = ftos(a);
NodeMetadata *meta = getmeta(ref, true); NodeMetadata *meta = ref->getmeta(true);
if(meta == NULL || str == meta->getString(name)) if(meta == NULL || str == meta->getString(name))
return 0; return 0;
meta->setString(name, str); meta->setString(name, str);
@ -190,7 +190,7 @@ int NodeMetaRef::l_get_inventory(lua_State *L)
MAP_LOCK_REQUIRED; MAP_LOCK_REQUIRED;
NodeMetaRef *ref = checkobject(L, 1); NodeMetaRef *ref = checkobject(L, 1);
getmeta(ref, true); // try to ensure the metadata exists ref->getmeta(true); // try to ensure the metadata exists
InvRef::createNodeMeta(L, ref->m_p); InvRef::createNodeMeta(L, ref->m_p);
return 1; return 1;
} }
@ -202,7 +202,7 @@ int NodeMetaRef::l_to_table(lua_State *L)
NodeMetaRef *ref = checkobject(L, 1); NodeMetaRef *ref = checkobject(L, 1);
NodeMetadata *meta = getmeta(ref, true); NodeMetadata *meta = ref->getmeta(true);
if (meta == NULL) { if (meta == NULL) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
@ -257,7 +257,7 @@ int NodeMetaRef::l_from_table(lua_State *L)
} }
// Create new metadata // Create new metadata
NodeMetadata *meta = getmeta(ref, true); NodeMetadata *meta = ref->getmeta(true);
if (meta == NULL) { if (meta == NULL) {
lua_pushboolean(L, false); lua_pushboolean(L, false);
return 1; return 1;

2
src/script/lua_api/l_nodemeta.h
View File

@ -52,7 +52,7 @@ private:
* @param auto_create when true, try to create metadata information for the node if it has none. * @param auto_create when true, try to create metadata information for the node if it has none.
* @return pointer to a @c NodeMetadata object or @c NULL in case of error. * @return pointer to a @c NodeMetadata object or @c NULL in case of error.
*/ */
static NodeMetadata* getmeta(NodeMetaRef *ref, bool auto_create); virtual NodeMetadata* getmeta(bool auto_create);
static void reportMetadataChange(NodeMetaRef *ref); static void reportMetadataChange(NodeMetaRef *ref);