NodeMetadata
*/
-NodeMetadata::NodeMetadata(IGameDef *gamedef):
- m_stringvars(),
- m_inventory(new Inventory(gamedef->idef()))
-{
-}
+NodeMetadata::NodeMetadata(IItemDefManager *item_def_mgr):
+ m_inventory(new Inventory(item_def_mgr))
+{}
NodeMetadata::~NodeMetadata()
{
{
int num_vars = m_stringvars.size();
writeU32(os, num_vars);
- for(std::map<std::string, std::string>::const_iterator
- i = m_stringvars.begin(); i != m_stringvars.end(); i++){
- os<<serializeString(i->first);
- os<<serializeLongString(i->second);
+ for (StringMap::const_iterator
+ it = m_stringvars.begin();
+ it != m_stringvars.end(); ++it) {
+ os << serializeString(it->first);
+ os << serializeLongString(it->second);
}
m_inventory->serialize(os);
void NodeMetadata::clear()
{
- m_stringvars.clear();
+ Metadata::clear();
m_inventory->clear();
}
+bool NodeMetadata::empty() const
+{
+ return Metadata::empty() && m_inventory->getLists().size() == 0;
+}
+
/*
NodeMetadataList
*/
Version 0 is a placeholder for "nothing to see here; go away."
*/
- if(m_data.empty()){
+ u16 count = countNonEmpty();
+ if (count == 0) {
writeU8(os, 0); // version
return;
}
writeU8(os, 1); // version
-
- u16 count = m_data.size();
writeU16(os, count);
for(std::map<v3s16, NodeMetadata*>::const_iterator
i = m_data.begin();
- i != m_data.end(); i++)
+ i != m_data.end(); ++i)
{
v3s16 p = i->first;
NodeMetadata *data = i->second;
+ if (data->empty())
+ continue;
- u16 p16 = p.Z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + p.Y*MAP_BLOCKSIZE + p.X;
+ u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X;
writeU16(os, p16);
data->serialize(os);
}
}
-void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
+void NodeMetadataList::deSerialize(std::istream &is, IItemDefManager *item_def_mgr)
{
clear();
u8 version = readU8(is);
- if(version == 0){
+ if (version == 0) {
// Nothing
return;
}
- if(version != 1){
- infostream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
- <<std::endl;
- throw SerializationError("NodeMetadataList::deSerialize");
+ if (version != 1) {
+ 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);
- for(u16 i=0; i<count; i++)
- {
+ for (u16 i=0; i < count; i++) {
u16 p16 = readU16(is);
v3s16 p;
p16 &= MAP_BLOCKSIZE - 1;
p.X = p16;
- if(m_data.find(p) != m_data.end())
- {
- infostream<<"WARNING: NodeMetadataList::deSerialize(): "
+ if (m_data.find(p) != m_data.end()) {
+ warningstream<<"NodeMetadataList::deSerialize(): "
<<"already set data at position"
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
<<std::endl;
continue;
}
- NodeMetadata *data = new NodeMetadata(gamedef);
+ NodeMetadata *data = new NodeMetadata(item_def_mgr);
data->deSerialize(is);
m_data[p] = data;
}
m_data.clear();
}
-std::string NodeMetadata::getString(const std::string &name,
- unsigned short recursion) const
+int NodeMetadataList::countNonEmpty() const
{
- std::map<std::string, std::string>::const_iterator it;
- it = m_stringvars.find(name);
- if (it == m_stringvars.end()) {
- return "";
- }
- return resolveString(it->second, recursion);
-}
-
-void NodeMetadata::setString(const std::string &name, const std::string &var)
-{
- if (var.empty()) {
- m_stringvars.erase(name);
- } else {
- m_stringvars[name] = var;
- }
-}
-
-std::string NodeMetadata::resolveString(const std::string &str,
- unsigned short recursion) const
-{
- if (recursion > 1) {
- return str;
- }
- if (str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
- return getString(str.substr(2, str.length() - 3), recursion + 1);
+ int n = 0;
+ std::map<v3s16, NodeMetadata*>::const_iterator it;
+ for (it = m_data.begin(); it != m_data.end(); ++it) {
+ if (!it->second->empty())
+ n++;
}
- return str;
+ return n;
}
-