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

Decouple entity minimap markers from nametags replacing with show_on_minimap property (#10443)

Browse source
This commit is contained in:
sfan5 2020-10-19 20:38:15 +02:00 • committed by GitHub
parent b826e39730
commit 660115c1ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 85 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/object_properties.cpp
View file

@ -70,6 +70,7 @@ std::string ObjectProperties::dump()
os << ", use_texture_alpha=" << use_texture_alpha;
os << ", damage_texture_modifier=" << damage_texture_modifier;
os << ", shaded=" << shaded;
os << ", show_on_minimap=" << show_on_minimap;
return os.str();
}
@ -118,6 +119,7 @@ void ObjectProperties::serialize(std::ostream &os) const
writeU8(os, use_texture_alpha);
os << serializeString16(damage_texture_modifier);
writeU8(os, shaded);
writeU8(os, show_on_minimap);
// Add stuff only at the bottom.
// Never remove anything, because we don't want new versions of this
@ -174,7 +176,11 @@ void ObjectProperties::deSerialize(std::istream &is)
damage_texture_modifier = deSerializeString16(is);
u8 tmp = readU8(is);
if (is.eof())
throw SerializationError("");
return;
shaded = tmp;
tmp = readU8(is);
if (is.eof())
return;
show_on_minimap = tmp;
} catch (SerializationError &e) {}
}