/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "nodemetadata.h"
-#include "utility.h"
-#include "mapnode.h"
#include "exceptions.h"
+#include "gamedef.h"
#include "inventory.h"
+#include "log.h"
+#include "util/serialize.h"
+#include "util/basic_macros.h"
+#include "constants.h" // MAP_BLOCKSIZE
+#include <sstream>
/*
NodeMetadata
*/
-core::map<u16, NodeMetadata::Factory> NodeMetadata::m_types;
-
-NodeMetadata::NodeMetadata()
-{
-}
+NodeMetadata::NodeMetadata(IItemDefManager *item_def_mgr):
+ m_inventory(new Inventory(item_def_mgr))
+{}
NodeMetadata::~NodeMetadata()
{
+ delete m_inventory;
}
-NodeMetadata* NodeMetadata::deSerialize(std::istream &is)
+void NodeMetadata::serialize(std::ostream &os, u8 version, bool disk) const
{
- u8 buf[2];
- is.read((char*)buf, 2);
- s16 id = readS16(buf);
+ int num_vars = disk ? m_stringvars.size() : countNonPrivate();
+ writeU32(os, num_vars);
+ for (const auto &sv : m_stringvars) {
+ bool priv = isPrivate(sv.first);
+ if (!disk && priv)
+ continue;
- core::map<u16, Factory>::Node *n;
- n = m_types.find(id);
- if(n == NULL)
- {
- dstream<<"NodeMetadata(): No factory for typeId="<<id<<std::endl;
- throw SerializationError("Unknown metadata id");
+ os << serializeString16(sv.first);
+ os << serializeString32(sv.second);
+ if (version >= 2)
+ writeU8(os, (priv) ? 1 : 0);
}
-
- Factory f = n->getValue();
- NodeMetadata *meta = (*f)(is);
- return meta;
+
+ m_inventory->serialize(os);
}
-void NodeMetadata::serialize(std::ostream &os)
+void NodeMetadata::deSerialize(std::istream &is, u8 version)
{
- u8 buf[2];
- writeU16(buf, typeId());
- os.write((char*)buf, 2);
+ clear();
+ int num_vars = readU32(is);
+ for(int i=0; i<num_vars; i++){
+ std::string name = deSerializeString16(is);
+ std::string var = deSerializeString32(is);
+ m_stringvars[name] = var;
+ if (version >= 2) {
+ if (readU8(is) == 1)
+ markPrivate(name, true);
+ }
+ }
- serializeBody(os);
+ m_inventory->deSerialize(is);
}
-void NodeMetadata::registerType(u16 id, Factory f)
+void NodeMetadata::clear()
{
- core::map<u16, Factory>::Node *n;
- n = m_types.find(id);
- if(n)
- return;
- m_types.insert(id, f);
+ Metadata::clear();
+ m_privatevars.clear();
+ m_inventory->clear();
}
-/*
- SignNodeMetadata
-*/
-
-SignNodeMetadata::SignNodeMetadata(std::string text):
- m_text(text)
-{
- NodeMetadata::registerType(typeId(), create);
-}
-u16 SignNodeMetadata::typeId() const
-{
- return CONTENT_SIGN_WALL;
-}
-NodeMetadata* SignNodeMetadata::create(std::istream &is)
-{
- std::string text = deSerializeString(is);
- return new SignNodeMetadata(text);
-}
-NodeMetadata* SignNodeMetadata::clone()
+bool NodeMetadata::empty() const
{
- return new SignNodeMetadata(m_text);
+ return Metadata::empty() && m_inventory->getLists().empty();
}
-void SignNodeMetadata::serializeBody(std::ostream &os)
+
+
+void NodeMetadata::markPrivate(const std::string &name, bool set)
{
- os<<serializeString(m_text);
+ if (set)
+ m_privatevars.insert(name);
+ else
+ m_privatevars.erase(name);
}
-std::string SignNodeMetadata::infoText()
+
+int NodeMetadata::countNonPrivate() const
{
- return std::string("\"")+m_text+"\"";
+ // m_privatevars can contain names not actually present
+ // DON'T: return m_stringvars.size() - m_privatevars.size();
+ int n = 0;
+ for (const auto &sv : m_stringvars) {
+ if (!isPrivate(sv.first))
+ n++;
+ }
+ return n;
}
/*
- ChestNodeMetadata
+ NodeMetadataList
*/
-ChestNodeMetadata::ChestNodeMetadata()
-{
- NodeMetadata::registerType(typeId(), create);
-
- m_inventory = new Inventory();
- m_inventory->addList("0", 8*4);
-}
-ChestNodeMetadata::~ChestNodeMetadata()
-{
- delete m_inventory;
-}
-u16 ChestNodeMetadata::typeId() const
+void NodeMetadataList::serialize(std::ostream &os, u8 blockver, bool disk,
+ bool absolute_pos) const
{
- return CONTENT_CHEST;
-}
-NodeMetadata* ChestNodeMetadata::create(std::istream &is)
-{
- ChestNodeMetadata *d = new ChestNodeMetadata();
- d->m_inventory->deSerialize(is);
- return d;
-}
-NodeMetadata* ChestNodeMetadata::clone()
-{
- ChestNodeMetadata *d = new ChestNodeMetadata();
- *d->m_inventory = *m_inventory;
- return d;
-}
-void ChestNodeMetadata::serializeBody(std::ostream &os)
-{
- m_inventory->serialize(os);
-}
-std::string ChestNodeMetadata::infoText()
-{
- return "Chest";
-}
-/*Inventory* ChestNodeMetadata::getInventory()
-{
- return m_inventory;
-}*/
+ /*
+ Version 0 is a placeholder for "nothing to see here; go away."
+ */
-/*
- NodeMetadatalist
-*/
+ u16 count = countNonEmpty();
+ if (count == 0) {
+ writeU8(os, 0); // version
+ return;
+ }
+
+ u8 version = (blockver > 27) ? 2 : 1;
+ writeU8(os, version);
+ writeU16(os, count);
+
+ for (NodeMetadataMap::const_iterator
+ i = m_data.begin();
+ i != m_data.end(); ++i) {
+ v3s16 p = i->first;
+ NodeMetadata *data = i->second;
+ if (data->empty())
+ continue;
-void NodeMetadataList::serialize(std::ostream &os)
-{
- u8 buf[6];
-
- u16 count = m_data.size();
- writeU16(buf, count);
- os.write((char*)buf, 2);
-
- for(core::map<v3s16, NodeMetadata*>::Iterator
- i = m_data.getIterator();
- i.atEnd()==false; i++)
- {
- v3s16 p = i.getNode()->getKey();
- NodeMetadata *data = i.getNode()->getValue();
-
- u16 p16 = p.Z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + p.Y*MAP_BLOCKSIZE + p.X;
- writeU16(buf, p16);
- os.write((char*)buf, 2);
-
- data->serialize(os);
+ if (absolute_pos) {
+ writeS16(os, p.X);
+ writeS16(os, p.Y);
+ writeS16(os, p.Z);
+ } else {
+ // Serialize positions within a mapblock
+ u16 p16 = (p.Z * MAP_BLOCKSIZE + p.Y) * MAP_BLOCKSIZE + p.X;
+ writeU16(os, p16);
+ }
+ data->serialize(os, version, disk);
}
-
}
-void NodeMetadataList::deSerialize(std::istream &is)
+
+void NodeMetadataList::deSerialize(std::istream &is,
+ IItemDefManager *item_def_mgr, bool absolute_pos)
{
- m_data.clear();
+ clear();
+
+ u8 version = readU8(is);
+
+ if (version == 0) {
+ // Nothing
+ return;
+ }
+
+ if (version > 2) {
+ std::string err_str = std::string(FUNCTION_NAME)
+ + ": version " + itos(version) + " not supported";
+ infostream << err_str << std::endl;
+ throw SerializationError(err_str);
+ }
+
+ u16 count = readU16(is);
- u8 buf[6];
-
- is.read((char*)buf, 2);
- u16 count = readU16(buf);
-
- for(u16 i=0; i<count; i++)
- {
- is.read((char*)buf, 2);
- u16 p16 = readU16(buf);
-
- v3s16 p(0,0,0);
- p.Z += p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
- p16 -= p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
- p.Y += p16 / MAP_BLOCKSIZE;
- p16 -= p.Y * MAP_BLOCKSIZE;
- p.X += p16;
-
- if(m_data.find(p))
- {
- dstream<<"ERROR: NodeMetadataList::deSerialize(): "
- <<"already set data at position"
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<std::endl;
- throw SerializationError("NodeMetadataList::deSerialize()");
+ for (u16 i = 0; i < count; i++) {
+ v3s16 p;
+ if (absolute_pos) {
+ p.X = readS16(is);
+ p.Y = readS16(is);
+ p.Z = readS16(is);
+ } else {
+ u16 p16 = readU16(is);
+ p.X = p16 & (MAP_BLOCKSIZE - 1);
+ p16 /= MAP_BLOCKSIZE;
+ p.Y = p16 & (MAP_BLOCKSIZE - 1);
+ p16 /= MAP_BLOCKSIZE;
+ p.Z = p16;
+ }
+ if (m_data.find(p) != m_data.end()) {
+ warningstream << "NodeMetadataList::deSerialize(): "
+ << "already set data at position " << PP(p)
+ << ": Ignoring." << std::endl;
+ continue;
}
- NodeMetadata *data = NodeMetadata::deSerialize(is);
-
- m_data.insert(p, data);
+ NodeMetadata *data = new NodeMetadata(item_def_mgr);
+ data->deSerialize(is, version);
+ m_data[p] = data;
}
}
-
+
NodeMetadataList::~NodeMetadataList()
{
- for(core::map<v3s16, NodeMetadata*>::Iterator
- i = m_data.getIterator();
- i.atEnd()==false; i++)
- {
- delete i.getNode()->getValue();
- }
+ clear();
+}
+
+std::vector<v3s16> NodeMetadataList::getAllKeys()
+{
+ std::vector<v3s16> keys;
+ keys.reserve(m_data.size());
+ for (const auto &it : m_data)
+ keys.push_back(it.first);
+
+ return keys;
}
-NodeMetadata* NodeMetadataList::get(v3s16 p)
+NodeMetadata *NodeMetadataList::get(v3s16 p)
{
- core::map<v3s16, NodeMetadata*>::Node *n;
- n = m_data.find(p);
- if(n == NULL)
- return NULL;
- return n->getValue();
+ NodeMetadataMap::const_iterator n = m_data.find(p);
+ if (n == m_data.end())
+ return nullptr;
+ return n->second;
}
void NodeMetadataList::remove(v3s16 p)
{
NodeMetadata *olddata = get(p);
- if(olddata)
- {
- delete olddata;
- m_data.remove(p);
+ if (olddata) {
+ if (m_is_metadata_owner)
+ delete olddata;
+ m_data.erase(p);
}
}
void NodeMetadataList::set(v3s16 p, NodeMetadata *d)
{
remove(p);
- m_data.insert(p, d);
+ m_data.emplace(p, d);
}
+void NodeMetadataList::clear()
+{
+ if (m_is_metadata_owner) {
+ NodeMetadataMap::const_iterator it;
+ for (it = m_data.begin(); it != m_data.end(); ++it)
+ delete it->second;
+ }
+ m_data.clear();
+}
+
+int NodeMetadataList::countNonEmpty() const
+{
+ int n = 0;
+ for (const auto &it : m_data) {
+ if (!it.second->empty())
+ n++;
+ }
+ return n;
+}
projects / dragonfireclient.git / blobdiff