#include "common/c_content.h"
#include "serverenvironment.h"
#include "map.h"
+#include "mapblock.h"
#include "server.h"
/*
NodeMetaRef
*/
-NodeMetaRef* NodeMetaRef::checkobject(lua_State *L, int narg)
+NodeMetaRef *NodeMetaRef::checkobject(lua_State *L, int narg)
{
luaL_checktype(L, narg, LUA_TUSERDATA);
void *ud = luaL_checkudata(L, narg, className);
- if(!ud) luaL_typerror(L, narg, className);
- return *(NodeMetaRef**)ud; // unbox pointer
+ if (!ud)
+ luaL_typerror(L, narg, className);
+ return *(NodeMetaRef **)ud; // unbox pointer
}
-Metadata* NodeMetaRef::getmeta(bool auto_create)
+Metadata *NodeMetaRef::getmeta(bool auto_create)
{
if (m_is_local)
return m_meta;
void NodeMetaRef::clearMeta()
{
+ SANITY_CHECK(!m_is_local);
m_env->getMap().removeNodeMetadata(m_p);
}
-void NodeMetaRef::reportMetadataChange()
+void NodeMetaRef::reportMetadataChange(const std::string *name)
{
+ SANITY_CHECK(!m_is_local);
// NOTE: This same code is in rollback_interface.cpp
// Inform other things that the metadata has changed
- v3s16 blockpos = getNodeBlockPos(m_p);
+ NodeMetadata *meta = dynamic_cast<NodeMetadata *>(m_meta);
+
MapEditEvent event;
event.type = MEET_BLOCK_NODE_METADATA_CHANGED;
- event.p = blockpos;
- m_env->getMap().dispatchEvent(&event);
- // Set the block to be saved
- MapBlock *block = m_env->getMap().getBlockNoCreateNoEx(blockpos);
- if (block) {
- block->raiseModified(MOD_STATE_WRITE_NEEDED,
- MOD_REASON_REPORT_META_CHANGE);
- }
+ event.p = m_p;
+ event.is_private_change = name && meta && meta->isPrivate(*name);
+ m_env->getMap().dispatchEvent(event);
}
// Exported functions
// garbage collector
-int NodeMetaRef::gc_object(lua_State *L) {
+int NodeMetaRef::gc_object(lua_State *L)
+{
NodeMetaRef *o = *(NodeMetaRef **)(lua_touserdata(L, 1));
delete o;
return 0;
MAP_LOCK_REQUIRED;
NodeMetaRef *ref = checkobject(L, 1);
- ref->getmeta(true); // try to ensure the metadata exists
+ ref->getmeta(true); // try to ensure the metadata exists
InvRef::createNodeMeta(L, ref->m_p);
return 1;
}
+// mark_as_private(self, <string> or {<string>, <string>, ...})
+int NodeMetaRef::l_mark_as_private(lua_State *L)
+{
+ MAP_LOCK_REQUIRED;
+
+ NodeMetaRef *ref = checkobject(L, 1);
+ NodeMetadata *meta = dynamic_cast<NodeMetadata *>(ref->getmeta(true));
+ assert(meta);
+
+ if (lua_istable(L, 2)) {
+ lua_pushnil(L);
+ while (lua_next(L, 2) != 0) {
+ // key at index -2 and value at index -1
+ luaL_checktype(L, -1, LUA_TSTRING);
+ meta->markPrivate(readParam<std::string>(L, -1), true);
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ } else if (lua_isstring(L, 2)) {
+ meta->markPrivate(readParam<std::string>(L, 2), true);
+ }
+ ref->reportMetadataChange();
+
+ return 0;
+}
+
void NodeMetaRef::handleToTable(lua_State *L, Metadata *_meta)
{
// fields
MetaDataRef::handleToTable(L, _meta);
- NodeMetadata *meta = (NodeMetadata*) _meta;
+ NodeMetadata *meta = (NodeMetadata *)_meta;
// inventory
lua_newtable(L);
Inventory *inv = meta->getInventory();
if (inv) {
std::vector<const InventoryList *> lists = inv->getLists();
- for(std::vector<const InventoryList *>::const_iterator
- i = lists.begin(); i != lists.end(); i++) {
+ for (std::vector<const InventoryList *>::const_iterator i = lists.begin();
+ i != lists.end(); ++i) {
push_inventory_list(L, inv, (*i)->getName().c_str());
lua_setfield(L, -2, (*i)->getName().c_str());
}
if (!MetaDataRef::handleFromTable(L, table, _meta))
return false;
- NodeMetadata *meta = (NodeMetadata*) _meta;
+ NodeMetadata *meta = (NodeMetadata *)_meta;
// inventory
Inventory *inv = meta->getInventory();
lua_pushnil(L);
while (lua_next(L, inventorytable) != 0) {
// key at index -2 and value at index -1
- std::string name = lua_tostring(L, -2);
+ std::string name = luaL_checkstring(L, -2);
read_inventory_list(L, -1, inv, name.c_str(), getServer(L));
lua_pop(L, 1); // Remove value, keep key for next iteration
}
return true;
}
-
-NodeMetaRef::NodeMetaRef(v3s16 p, ServerEnvironment *env):
- m_p(p),
- m_env(env),
- m_is_local(false)
+NodeMetaRef::NodeMetaRef(v3s16 p, ServerEnvironment *env) : m_p(p), m_env(env)
{
}
-NodeMetaRef::NodeMetaRef(Metadata *meta):
- m_meta(meta),
- m_is_local(true)
-{
-}
-
-NodeMetaRef::~NodeMetaRef()
+NodeMetaRef::NodeMetaRef(Metadata *meta) : m_meta(meta), m_is_local(true)
{
}
void NodeMetaRef::create(lua_State *L, v3s16 p, ServerEnvironment *env)
{
NodeMetaRef *o = new NodeMetaRef(p, env);
- //infostream<<"NodeMetaRef::create: o="<<o<<std::endl;
+ // infostream<<"NodeMetaRef::create: o="<<o<<std::endl;
*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
luaL_getmetatable(L, className);
lua_setmetatable(L, -2);
lua_pushliteral(L, "__metatable");
lua_pushvalue(L, methodtable);
- lua_settable(L, metatable); // hide metatable from Lua getmetatable()
+ lua_settable(L, metatable); // hide metatable from Lua getmetatable()
lua_pushliteral(L, "metadata_class");
lua_pushlstring(L, className, strlen(className));
lua_pushcfunction(L, l_equals);
lua_settable(L, metatable);
- lua_pop(L, 1); // drop metatable
+ lua_pop(L, 1); // drop metatable
}
void NodeMetaRef::Register(lua_State *L)
{
RegisterCommon(L);
- luaL_openlib(L, 0, methodsServer, 0); // fill methodtable
- lua_pop(L, 1); // drop methodtable
+ luaL_openlib(L, 0, methodsServer, 0); // fill methodtable
+ lua_pop(L, 1); // drop methodtable
}
-
-const luaL_Reg NodeMetaRef::methodsServer[] = {
- luamethod(MetaDataRef, get_string),
- luamethod(MetaDataRef, set_string),
- luamethod(MetaDataRef, get_int),
- luamethod(MetaDataRef, set_int),
- luamethod(MetaDataRef, get_float),
- luamethod(MetaDataRef, set_float),
- luamethod(MetaDataRef, to_table),
- luamethod(MetaDataRef, from_table),
- luamethod(NodeMetaRef, get_inventory),
- luamethod(MetaDataRef, equals),
- {0,0}
-};
-
+const luaL_Reg NodeMetaRef::methodsServer[] = {luamethod(MetaDataRef, contains),
+ luamethod(MetaDataRef, get), luamethod(MetaDataRef, get_string),
+ luamethod(MetaDataRef, set_string), luamethod(MetaDataRef, get_int),
+ luamethod(MetaDataRef, set_int), luamethod(MetaDataRef, get_float),
+ luamethod(MetaDataRef, set_float), luamethod(MetaDataRef, to_table),
+ luamethod(MetaDataRef, from_table), luamethod(NodeMetaRef, get_inventory),
+ luamethod(NodeMetaRef, mark_as_private), luamethod(MetaDataRef, equals),
+ {0, 0}};
void NodeMetaRef::RegisterClient(lua_State *L)
{
RegisterCommon(L);
- luaL_openlib(L, 0, methodsClient, 0); // fill methodtable
- lua_pop(L, 1); // drop methodtable
+ luaL_openlib(L, 0, methodsClient, 0); // fill methodtable
+ lua_pop(L, 1); // drop methodtable
}
-
-const luaL_Reg NodeMetaRef::methodsClient[] = {
- luamethod(MetaDataRef, get_string),
- luamethod(MetaDataRef, get_int),
- luamethod(MetaDataRef, get_float),
- luamethod(MetaDataRef, to_table),
- {0,0}
-};
+const luaL_Reg NodeMetaRef::methodsClient[] = {luamethod(MetaDataRef, contains),
+ luamethod(MetaDataRef, get), luamethod(MetaDataRef, get_string),
+ luamethod(MetaDataRef, get_int), luamethod(MetaDataRef, get_float),
+ luamethod(MetaDataRef, to_table), {0, 0}};
projects / dragonfireclient.git / blobdiff