games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

try to fix build, use plain -1 in place of CGHeroInstance::NO_PATROLLING

Browse Source
This commit is contained in:
godric3
2024-10-28 22:46:48 +01:00
parent 56efb82b2e
commit da5bae301a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -1874,6 +1874,5 @@ const IOwnableObject * CGHeroInstance::asOwnable() const
return this; return this;
} }
inline constexpr int CGHeroInstance::NO_PATROLLING;
VCMI_LIB_NAMESPACE_END VCMI_LIB_NAMESPACE_END

9
mapeditor/inspector/inspector.cpp
View File

@@ -18,7 +18,6 @@
#include "../lib/mapObjectConstructors/AObjectTypeHandler.h" #include "../lib/mapObjectConstructors/AObjectTypeHandler.h"
#include "../lib/mapObjectConstructors/CObjectClassesHandler.h" #include "../lib/mapObjectConstructors/CObjectClassesHandler.h"
#include "../lib/mapObjects/ObjectTemplate.h" #include "../lib/mapObjects/ObjectTemplate.h"
#include "../lib/mapObjects/CGHeroInstance.h"
#include "../lib/mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/constants/StringConstants.h" #include "../lib/constants/StringConstants.h"
@@ -339,7 +338,7 @@ void Inspector::updateProperties(CGHeroInstance * o)
{ {
const int maxRadius = 60; const int maxRadius = 60;
auto * patrolDelegate = new InspectorDelegate; auto * patrolDelegate = new InspectorDelegate;
patrolDelegate->options = { {QObject::tr("No patrol"), QVariant::fromValue(CGHeroInstance::NO_PATROLLING)} }; patrolDelegate->options = { {QObject::tr("No patrol"), QVariant::fromValue(-1)} };
for(int i = 0; i <= maxRadius; ++i) for(int i = 0; i <= maxRadius; ++i)
patrolDelegate->options.push_back({ QObject::tr("%1 tile(s)").arg(i), QVariant::fromValue(i) }); patrolDelegate->options.push_back({ QObject::tr("%1 tile(s)").arg(i), QVariant::fromValue(i) });
auto patrolRadiusText = o->patrol.patrolling ? QObject::tr("%1 tile(s)").arg(o->patrol.patrolRadius) : QObject::tr("No patrol"); auto patrolRadiusText = o->patrol.patrolling ? QObject::tr("%1 tile(s)").arg(o->patrol.patrolRadius) : QObject::tr("No patrol");
@@ -724,9 +723,9 @@ void Inspector::setProperty(CGHeroInstance * o, const QString & key, const QVari
if(key == "Patrol radius") if(key == "Patrol radius")
{ {
o->patrol.patrolRadius = value.toInt(); auto radius = value.toInt();
if(o->patrol.patrolRadius != CGHeroInstance::NO_PATROLLING) o->patrol.patrolRadius = radius;
o->patrol.patrolling = true; o->patrol.patrolling = radius != -1;
} }
} }