diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2014-06-25 20:28:41 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-11-19 16:21:59 -0500 |
| commit | b1965ac20922e3722392114bd63a22b403dcbe98 (patch) | |
| tree | ab7ba20d23e01be920d7161fbfd20d2e265f2b70 /src/inventory.cpp | |
| parent | da0f1e5497c7dece9ff5092adfb5881b0dd2e10c (diff) | |
| download | minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.gz minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.bz2 minetest-b1965ac20922e3722392114bd63a22b403dcbe98.zip | |
Clean up rollback
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index cecef01a0..3fa31965c 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -183,7 +183,8 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) legacy_nimap.getName(material, name); if(name == "") name = "unknown_block"; - name = itemdef->getAlias(name); + if (itemdef) + name = itemdef->getAlias(name); count = materialcount; } else if(name == "MaterialItem2") @@ -202,7 +203,8 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) legacy_nimap.getName(material, name); if(name == "") name = "unknown_block"; - name = itemdef->getAlias(name); + if (itemdef) + name = itemdef->getAlias(name); count = materialcount; } else if(name == "node" || name == "NodeItem" || name == "MaterialItem3" @@ -223,7 +225,8 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) name = fnd.next(" "); } fnd.skip_over(" "); - name = itemdef->getAlias(name); + if (itemdef) + name = itemdef->getAlias(name); count = stoi(trim(fnd.next(""))); if(count == 0) count = 1; @@ -252,7 +255,8 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) count = 1; // Then read wear fnd.skip_over(" "); - name = itemdef->getAlias(name); + if (itemdef) + name = itemdef->getAlias(name); wear = stoi(trim(fnd.next(""))); } else @@ -262,7 +266,8 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) // The real thing // Apply item aliases - name = itemdef->getAlias(name); + if (itemdef) + name = itemdef->getAlias(name); // Read the count std::string count_str; @@ -294,9 +299,9 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) } while(false); } - if(name.empty() || count == 0) + if (name.empty() || count == 0) clear(); - else if(itemdef->get(name).type == ITEM_TOOL) + else if (itemdef && itemdef->get(name).type == ITEM_TOOL) count = 1; } @@ -308,12 +313,12 @@ void ItemStack::deSerialize(const std::string &str, IItemDefManager *itemdef) std::string ItemStack::getItemString() const { - // Get item string std::ostringstream os(std::ios::binary); serialize(os); return os.str(); } + ItemStack ItemStack::addItem(const ItemStack &newitem_, IItemDefManager *itemdef) { |