mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-11 17:51:04 +00:00
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
This commit is contained in:
parent
3c61d57f6d
commit
c638442e78
40 changed files with 1837 additions and 920 deletions
|
@ -1924,9 +1924,19 @@ void MapBlock::serialize(std::ostream &os, u8 version)
|
|||
*/
|
||||
if(version >= 14)
|
||||
{
|
||||
std::ostringstream oss(std::ios_base::binary);
|
||||
m_node_metadata.serialize(oss);
|
||||
os<<serializeString(oss.str());
|
||||
if(version <= 15)
|
||||
{
|
||||
std::ostringstream oss(std::ios_base::binary);
|
||||
m_node_metadata.serialize(oss);
|
||||
os<<serializeString(oss.str());
|
||||
}
|
||||
else
|
||||
{
|
||||
std::ostringstream oss(std::ios_base::binary);
|
||||
m_node_metadata.serialize(oss);
|
||||
compressZlib(oss.str(), os);
|
||||
//os<<serializeLongString(oss.str());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2055,9 +2065,20 @@ void MapBlock::deSerialize(std::istream &is, u8 version)
|
|||
{
|
||||
// Ignore errors
|
||||
try{
|
||||
std::string data = deSerializeString(is);
|
||||
std::istringstream iss(data, std::ios_base::binary);
|
||||
m_node_metadata.deSerialize(iss);
|
||||
if(version <= 15)
|
||||
{
|
||||
std::string data = deSerializeString(is);
|
||||
std::istringstream iss(data, std::ios_base::binary);
|
||||
m_node_metadata.deSerialize(iss);
|
||||
}
|
||||
else
|
||||
{
|
||||
//std::string data = deSerializeLongString(is);
|
||||
std::ostringstream oss(std::ios_base::binary);
|
||||
decompressZlib(is, oss);
|
||||
std::istringstream iss(oss.str(), std::ios_base::binary);
|
||||
m_node_metadata.deSerialize(iss);
|
||||
}
|
||||
}
|
||||
catch(SerializationError &e)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue