Migrates AreaEffectSimulation to generated rtiddsgen API
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
102 files changed
+3307
-3313
No files matched your search
@@ -149,7 +149,7 @@ class ObjectBase : public QObject
|
||||
QPolygonF out;
|
||||
out.reserve(in.size());
|
||||
for (const auto &pos : qAsConst(in))
|
||||
out.push_back(QPointF(pos.lon(), pos.lat()));
|
||||
out.push_back(QPointF(pos.lon, pos.lat));
|
||||
|
||||
return out;
|
||||
}
|
||||
@@ -300,7 +300,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
m_data.effectStart = tTempStart;
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Can not activate effect simulation with id %1 which is in the effect state with id %2."))
|
||||
.arg(m_data.id)
|
||||
.arg(m_data.effectStateId.underlying());
|
||||
.arg(static_cast<int>(m_data.effectStateId));
|
||||
}
|
||||
|
||||
return Core::FunctionReplyObject();
|
||||
@@ -357,10 +357,10 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
if (wasCentral && (effectState() == AesEffectState::EsExpired || effectState() == AesEffectState::EsActivated || effectState() == AesEffectState::EsPaused))
|
||||
return true;
|
||||
|
||||
if (static_cast<MineClass::type>(m_mainHandler->dds()->pdmDtc()->mineClass(m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId)) == MineClass::VirtualSingle)
|
||||
if (static_cast<MineClass>(m_mainHandler->dds()->pdmDtc()->mineClass(m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId)) == MineClass::VirtualSingle)
|
||||
return true;
|
||||
|
||||
if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
|
||||
if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
|
||||
return true;
|
||||
|
||||
// Laser-Guidable Weapons must always be calculated by CES
|
||||
@@ -368,7 +368,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
return true;
|
||||
|
||||
// PzAbwVMi B always true
|
||||
if (static_cast<MineClass::type>(m_mainHandler->dds()->pdmDtc()->mineClass(m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId)) == MineClass::Concrete)
|
||||
if (static_cast<MineClass>(m_mainHandler->dds()->pdmDtc()->mineClass(m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId)) == MineClass::Concrete)
|
||||
return true;
|
||||
|
||||
// If form didn't change, isCentral cannot change either:
|
||||
@@ -379,9 +379,9 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
const QMap<int, InfrastructureManagement::SpecialArea> spAMap = m_mainHandler->specialAreaProvider()->getSpecialAreas();
|
||||
for (const InfrastructureManagement::SpecialArea &sa : spAMap)
|
||||
{
|
||||
if (sa.specialType() != InfrastructureManagement::SpecialAreaType::SatCesArea)
|
||||
if (sa.specialType != InfrastructureManagement::SpecialAreaType::SatCesArea)
|
||||
continue;
|
||||
if (intersects(form, sa.polygon()))
|
||||
if (intersects(form, sa.polygon))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user