oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

LuaItemStack: Add __tostring metamethod (#8785)

Browse source 
* LuaItemStack: Add __tostring metamethod

* Clean up LuaItemStack::checkobject
This commit is contained in:
Paul Ouellette 2020-06-09 13:37:25 -04:00 • committed by GitHub
parent 09e285f38c
commit b16f841756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/inventory.cpp
View file

@ -56,28 +56,31 @@ ItemStack::ItemStack(const std::string &name_, u16 count_,
count = 1;
}
void ItemStack::serialize(std::ostream &os) const
void ItemStack::serialize(std::ostream &os, bool serialize_meta) const
{
if (empty())
return;
// Check how many parts of the itemstring are needed
int parts = 1;
if(count != 1)
parts = 2;
if(wear != 0)
parts = 3;
if (!metadata.empty())
parts = 4;
else if (wear != 0)
parts = 3;
else if (count != 1)
parts = 2;
os<<serializeJsonStringIfNeeded(name);
if(parts >= 2)
os<<" "<<count;
if(parts >= 3)
os<<" "<<wear;
os << serializeJsonStringIfNeeded(name);
if (parts >= 2)
os << " " << count;
if (parts >= 3)
os << " " << wear;
if (parts >= 4) {
os << " ";
metadata.serialize(os);
if (serialize_meta)
metadata.serialize(os);
else
os << "<metadata size=" << metadata.size() << ">";
}
}
@ -240,10 +243,10 @@ void ItemStack::deSerialize(const std::string &str, IItemDefManager *itemdef)
deSerialize(is, itemdef);
}
std::string ItemStack::getItemString() const
std::string ItemStack::getItemString(bool include_meta) const
{
std::ostringstream os(std::ios::binary);
serialize(os);
serialize(os, include_meta);
return os.str();
}