games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Xilmi
2024-10-31 12:29:37 +01:00
parent 5979f53a26 09e2d1a59a
commit 63097968d3
68 changed files with 833 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -49,6 +49,8 @@
VCMI_LIB_NAMESPACE_BEGIN
const ui32 CGHeroInstance::NO_PATROLLING = std::numeric_limits<ui32>::max();
void CGHeroPlaceholder::serializeJsonOptions(JsonSerializeFormat & handler)
{
serializeJsonOwner(handler);
@@ -1772,21 +1774,20 @@ void CGHeroInstance::serializeJsonOptions(JsonSerializeFormat & handler)
CArmedInstance::serializeJsonOptions(handler);
{
static constexpr int NO_PATROLING = -1;
int rawPatrolRadius = NO_PATROLING;
ui32 rawPatrolRadius = NO_PATROLLING;
if(handler.saving)
{
rawPatrolRadius = patrol.patrolling ? patrol.patrolRadius : NO_PATROLING;
rawPatrolRadius = patrol.patrolling ? patrol.patrolRadius : NO_PATROLLING;
}
handler.serializeInt("patrolRadius", rawPatrolRadius, NO_PATROLING);
handler.serializeInt("patrolRadius", rawPatrolRadius, NO_PATROLLING);
if(!handler.saving)
{
patrol.patrolling = (rawPatrolRadius > NO_PATROLING);
patrol.patrolling = (rawPatrolRadius != NO_PATROLLING);
patrol.initialPos = visitablePos();
patrol.patrolRadius = (rawPatrolRadius > NO_PATROLING) ? rawPatrolRadius : 0;
patrol.patrolRadius = patrol.patrolling ? rawPatrolRadius : 0;
}
}
}