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

Settings: Proper priority hierarchy

Browse source 
Remove old defaults system
Introduce priority-based fallback list
Use new functions for map_meta special functions
Change groups to use end tags

Unittest changes:
 * Adapt unittest to the new code
 * Compare Settings objects
This commit is contained in:
SmallJoker 2020-11-22 17:49:30 +01:00 • committed by sfan5
parent 5e9dd1667b
commit 37a05ec8d6
21 changed files with 358 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/database/database-files.cpp
View file

@ -122,18 +122,17 @@ void PlayerDatabaseFiles::serialize(RemotePlayer *p, std::ostream &os)
args.set("name", p->m_name);
// This should not happen
assert(m_sao);
args.setU16("hp", p->m_sao->getHP());
args.setV3F("position", p->m_sao->getBasePosition());
args.setFloat("pitch", p->m_sao->getLookPitch());
args.setFloat("yaw", p->m_sao->getRotation().Y);
args.setU16("breath", p->m_sao->getBreath());
PlayerSAO *sao = p->getPlayerSAO();
assert(sao);
args.setU16("hp", sao->getHP());
args.setV3F("position", sao->getBasePosition());
args.setFloat("pitch", sao->getLookPitch());
args.setFloat("yaw", sao->getRotation().Y);
args.setU16("breath", sao->getBreath());
std::string extended_attrs;
{
// serializeExtraAttributes
PlayerSAO *sao = p->getPlayerSAO();
assert(sao);
Json::Value json_root;
const StringMap &attrs = sao->getMeta().getStrings();