diff options
| author | rubenwardy <rubenwardy@gmail.com> | 2017-01-31 14:45:28 +0000 |
|---|---|---|
| committer | rubenwardy <rubenwardy@gmail.com> | 2017-02-04 22:07:55 +0000 |
| commit | bbdd869d72d7b5aae2994d287f69e1c1d866f4e2 (patch) | |
| tree | 267b0ebc5c8970b2b7cae16a6242062a11f752c6 /src/nodemetadata.cpp | |
| parent | de664b1c6d4b2bca47f918a6a865a920434bf664 (diff) | |
| download | minetest-bbdd869d72d7b5aae2994d287f69e1c1d866f4e2.tar.gz minetest-bbdd869d72d7b5aae2994d287f69e1c1d866f4e2.tar.bz2 minetest-bbdd869d72d7b5aae2994d287f69e1c1d866f4e2.zip | |
Derive NodeMetadata from Metadata
Diffstat (limited to 'src/nodemetadata.cpp')
| -rw-r--r-- | src/nodemetadata.cpp | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index 0801a028b..9b60cf33e 100644 --- a/src/nodemetadata.cpp +++ b/src/nodemetadata.cpp @@ -31,10 +31,8 @@ with this program; if not, write to the Free Software Foundation, Inc., */ NodeMetadata::NodeMetadata(IItemDefManager *item_def_mgr): - m_stringvars(), m_inventory(new Inventory(item_def_mgr)) -{ -} +{} NodeMetadata::~NodeMetadata() { @@ -70,13 +68,13 @@ void NodeMetadata::deSerialize(std::istream &is) void NodeMetadata::clear() { - m_stringvars.clear(); + Metadata::clear(); m_inventory->clear(); } bool NodeMetadata::empty() const { - return m_stringvars.size() == 0 && m_inventory->getLists().size() == 0; + return Metadata::empty() && m_inventory->getLists().size() == 0; } /* @@ -216,35 +214,3 @@ int NodeMetadataList::countNonEmpty() const } return n; } - -std::string NodeMetadata::getString(const std::string &name, - unsigned short recursion) const -{ - StringMap::const_iterator 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); - } - return str; -} - |