mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity

Rework reading peep anim object properties

Browse Source
This commit is contained in:
Aaron van Geffen
2024-12-10 23:39:58 +01:00
parent d768811c5c
commit 4f1a7c72aa
4 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/object/PeepAnimationsObject.cpp
View File

@@ -58,11 +58,8 @@ void PeepAnimationsObject::ReadJson(IReadObjectContext* context, json_t& root)
Guard::Assert(root.is_object(), "PeepAnimationsObject::ReadJson expects parameter root to be an object");
PopulateTablesFromJson(context, root);
Guard::Assert(root["peepType"].is_string(), "PeepAnimationsObject::ReadJson expects peepType to be a string");
_peepType = animationPeepTypeMap[Json::GetString(root["peepType"])];
Guard::Assert(root["isSlowWalking"].is_boolean(), "PeepAnimationsObject::ReadJson expects isSlowWalking to be a boolean");
_slowWalking = Json::GetBoolean(root["isSlowWalking"]);
Guard::Assert(root["properties"].is_object(), "PeepAnimationsObject::ReadJson expects properties to be an object");
ReadProperties(root["properties"]);
auto& requiredAnimationMap = getAnimationsByPeepType(_peepType);
_animationGroups.clear();
@@ -147,6 +144,21 @@ PeepAnimations PeepAnimationsObject::ReadAnimations(const EnumMap<PeepAnimationT
return group;
}
void PeepAnimationsObject::ReadProperties(json_t& props)
{
Guard::Assert(props["peepType"].is_string(), "PeepAnimationsObject::ReadProperties expects peepType to be a string");
_peepType = animationPeepTypeMap[Json::GetString(props["peepType"])];
Guard::Assert(
props["isSlowWalking"].is_boolean(), "PeepAnimationsObject::ReadProperties expects isSlowWalking to be a boolean");
_slowWalking = Json::GetBoolean(props["isSlowWalking"], false);
Guard::Assert(
props["noRandomPlacement"].is_boolean(),
"PeepAnimationsObject::ReadProperties expects noRandomPlacement to be a boolean");
_noRandomPlacement = Json::GetBoolean(props["noRandomPlacement"], false);
}
std::string PeepAnimationsObject::GetCostumeName() const
{
return GetStringTable().GetString(ObjectStringID::NAME);