Migrates OcSituation and ServiceManagement to generated rtiddsgen API

Converts accessor calls to plain member access in osc, oss and obd services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:47 +02:00
1 parent 95071993f5
commit 3ec4208139
30 files changed
+1000 -1007

No files matched your search

@@ -35,282 +35,282 @@ bool CentralAesByteReader::getRemoveMessage(size_t &pos, CentralAesByteReader::R
bool CentralAesByteReader::getNContamination(size_t &pos, AreaEffectSimulation::NContaminationModifyRequest &nContamination) const
{
bool result = getAesItemId(pos, nContamination.id());
result &= getName(pos, nContamination.name());
result &= getOptionalNumber(pos, nContamination.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, nContamination.effectDuration());
result &= getChargeTypeId(pos, nContamination.chargeTypeId());
result &= getImpactPosition(pos, nContamination.impactPosition());
result &= getBorderLengthInner(pos, nContamination.borderLengthInner());
result &= getBorderLengthOuter(pos, nContamination.borderLengthOuter());
result &= getImpactRadius(pos, nContamination.impactRadius());
result &= getSpanAngle(pos, nContamination.spanAngle());
result &= getRotationAngle(pos, nContamination.rotationAngle());
result &= getDetonationValue(pos, nContamination.detonationValue());
result &= getOptionalNumber(pos, nContamination.partyId(), &CentralAesByteReader::getPartyId);
bool result = getAesItemId(pos, nContamination.id);
result &= getName(pos, nContamination.name);
result &= getOptionalNumber(pos, nContamination.effectStart, &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, nContamination.effectDuration);
result &= getChargeTypeId(pos, nContamination.chargeTypeId);
result &= getImpactPosition(pos, nContamination.impactPosition);
result &= getBorderLengthInner(pos, nContamination.borderLengthInner);
result &= getBorderLengthOuter(pos, nContamination.borderLengthOuter);
result &= getImpactRadius(pos, nContamination.impactRadius);
result &= getSpanAngle(pos, nContamination.spanAngle);
result &= getRotationAngle(pos, nContamination.rotationAngle);
result &= getDetonationValue(pos, nContamination.detonationValue);
result &= getOptionalNumber(pos, nContamination.partyId, &CentralAesByteReader::getPartyId);
nContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
nContamination.weatherSource = AreaEffectSimulation::AesWeatherSource::AwsNoUpdate;
DEBUG_LOG(m_logger) << "Got NContamination:"
<< "\nid = " << nContamination.id()
<< "\nname = " << nContamination.name()
<< "\neffectStart = " << nContamination.effectStart()
<< "\neffectDuration = " << nContamination.effectDuration()
<< "\nchargeTypeId = " << nContamination.chargeTypeId()
<< "\nimpactPosition = " << nContamination.impactPosition()
<< "\nborderLengthInner = " << nContamination.borderLengthInner()
<< "\nborderLengthOuter = " << nContamination.borderLengthOuter()
<< "\nimpactRadius = " << nContamination.impactRadius()
<< "\nspanAngle = " << nContamination.spanAngle()
<< "\nrotationAngle = " << nContamination.rotationAngle()
<< "\ndetonationValue = " << nContamination.detonationValue()
<< "\npartyId = " << nContamination.partyId();
<< "\nid = " << nContamination.id
<< "\nname = " << nContamination.name
<< "\neffectStart = " << nContamination.effectStart
<< "\neffectDuration = " << nContamination.effectDuration
<< "\nchargeTypeId = " << nContamination.chargeTypeId
<< "\nimpactPosition = " << nContamination.impactPosition
<< "\nborderLengthInner = " << nContamination.borderLengthInner
<< "\nborderLengthOuter = " << nContamination.borderLengthOuter
<< "\nimpactRadius = " << nContamination.impactRadius
<< "\nspanAngle = " << nContamination.spanAngle
<< "\nrotationAngle = " << nContamination.rotationAngle
<< "\ndetonationValue = " << nContamination.detonationValue
<< "\npartyId = " << nContamination.partyId;
return result;
}
bool CentralAesByteReader::getBCContamination(size_t &pos, AreaEffectSimulation::BCContaminationModifyRequest &bCContamination) const
{
bool result = getAesItemId(pos, bCContamination.id());
result &= getName(pos, bCContamination.name());
result &= getOptionalNumber(pos, bCContamination.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, bCContamination.effectDuration());
result &= getChargeTypeId(pos, bCContamination.chargeTypeId());
result &= getImpactPosition(pos, bCContamination.impactPosition());
result &= getImpactRadius(pos, bCContamination.impactRadius());
result &= getOptionalNumber(pos, bCContamination.partyId(), &CentralAesByteReader::getPartyId);
result &= getOptionalNumber(pos, bCContamination.propagationDirection(), &CentralAesByteReader::getPropagationDirection);
result &= getOptionalNumber(pos, bCContamination.windSpeed(), &CentralAesByteReader::getWindSpeed);
bool result = getAesItemId(pos, bCContamination.id);
result &= getName(pos, bCContamination.name);
result &= getOptionalNumber(pos, bCContamination.effectStart, &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, bCContamination.effectDuration);
result &= getChargeTypeId(pos, bCContamination.chargeTypeId);
result &= getImpactPosition(pos, bCContamination.impactPosition);
result &= getImpactRadius(pos, bCContamination.impactRadius);
result &= getOptionalNumber(pos, bCContamination.partyId, &CentralAesByteReader::getPartyId);
result &= getOptionalNumber(pos, bCContamination.propagationDirection, &CentralAesByteReader::getPropagationDirection);
result &= getOptionalNumber(pos, bCContamination.windSpeed, &CentralAesByteReader::getWindSpeed);
bCContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
bCContamination.weatherSource = AreaEffectSimulation::AesWeatherSource::AwsNoUpdate;
DEBUG_LOG(m_logger) << "Got BCContamination:"
<< "\nid = " << bCContamination.id()
<< "\nname = " << bCContamination.name()
<< "\neffectStart = " << bCContamination.effectStart()
<< "\neffectDuration = " << bCContamination.effectDuration()
<< "\nchargeTypeId = " << bCContamination.chargeTypeId()
<< "\nimpactPosition = " << bCContamination.impactPosition()
<< "\nimpactRadius = " << bCContamination.impactRadius()
<< "\nweatherSource = " << bCContamination.weatherSource()
<< "\npartyId = " << bCContamination.partyId()
<< "\npropagationDirection = " << bCContamination.propagationDirection()
<< "\nwindSpeed = " << bCContamination.windSpeed()
<< "\nweatherPosition = " << bCContamination.weatherPosition()
<< "\nweatherTimestamp = " << bCContamination.weatherTimestamp();
<< "\nid = " << bCContamination.id
<< "\nname = " << bCContamination.name
<< "\neffectStart = " << bCContamination.effectStart
<< "\neffectDuration = " << bCContamination.effectDuration
<< "\nchargeTypeId = " << bCContamination.chargeTypeId
<< "\nimpactPosition = " << bCContamination.impactPosition
<< "\nimpactRadius = " << bCContamination.impactRadius
<< "\nweatherSource = " << bCContamination.weatherSource
<< "\npartyId = " << bCContamination.partyId
<< "\npropagationDirection = " << bCContamination.propagationDirection
<< "\nwindSpeed = " << bCContamination.windSpeed
<< "\nweatherPosition = " << bCContamination.weatherPosition
<< "\nweatherTimestamp = " << bCContamination.weatherTimestamp;
return result;
}
bool CentralAesByteReader::getExplosionArea(size_t &pos, AreaEffectSimulation::ExplosionAreaModifyRequest &explosionArea) const
{
bool result = getAesItemId(pos, explosionArea.id());
result &= getName(pos, explosionArea.name());
result &= getOptionalNumber(pos, explosionArea.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, explosionArea.effectDuration());
result &= getChargeTypeId(pos, explosionArea.chargeTypeId());
result &= getArea(pos, explosionArea.area());
result &= getOptionalNumber(pos, explosionArea.partyId(), &CentralAesByteReader::getPartyId);
result &= getCannonCount(pos, explosionArea.cannonCount());
result &= getCannonRounds(pos, explosionArea.cannonRounds());
result &= getFireRequestTime(pos, explosionArea.fireRequestTime());
result &= getAltitude(pos, explosionArea.altitude());
result &= getPurpose(pos, explosionArea.purpose());
bool result = getAesItemId(pos, explosionArea.id);
result &= getName(pos, explosionArea.name);
result &= getOptionalNumber(pos, explosionArea.effectStart, &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, explosionArea.effectDuration);
result &= getChargeTypeId(pos, explosionArea.chargeTypeId);
result &= getArea(pos, explosionArea.area);
result &= getOptionalNumber(pos, explosionArea.partyId, &CentralAesByteReader::getPartyId);
result &= getCannonCount(pos, explosionArea.cannonCount);
result &= getCannonRounds(pos, explosionArea.cannonRounds);
result &= getFireRequestTime(pos, explosionArea.fireRequestTime);
result &= getAltitude(pos, explosionArea.altitude);
result &= getPurpose(pos, explosionArea.purpose);
DEBUG_LOG(m_logger) << "Got ExplosionArea:"
<< "\nid = " << explosionArea.id()
<< "\nname = " << explosionArea.name()
<< "\neffectStart = " << explosionArea.effectStart()
<< "\neffectDuration = " << explosionArea.effectDuration()
<< "\nchargeTypeId = " << explosionArea.chargeTypeId()
<< "\narea = " << explosionArea.area()
<< "\npartyId = " << explosionArea.partyId()
<< "\ncannonCount = " << explosionArea.cannonCount()
<< "\ncannonRounds = " << explosionArea.cannonRounds()
<< "\nfireRequestTime = " << explosionArea.fireRequestTime()
<< "\naltitude = " << explosionArea.altitude()
<< "\npurpose = " << explosionArea.purpose();
<< "\nid = " << explosionArea.id
<< "\nname = " << explosionArea.name
<< "\neffectStart = " << explosionArea.effectStart
<< "\neffectDuration = " << explosionArea.effectDuration
<< "\nchargeTypeId = " << explosionArea.chargeTypeId
<< "\narea = " << explosionArea.area
<< "\npartyId = " << explosionArea.partyId
<< "\ncannonCount = " << explosionArea.cannonCount
<< "\ncannonRounds = " << explosionArea.cannonRounds
<< "\nfireRequestTime = " << explosionArea.fireRequestTime
<< "\naltitude = " << explosionArea.altitude
<< "\npurpose = " << explosionArea.purpose;
return result;
}
bool CentralAesByteReader::getExplosionSingle(size_t &pos, AreaEffectSimulation::ExplosionSingleModifyRequest &explosionSingle) const
{
bool result = getAesItemId(pos, explosionSingle.id());
result &= getName(pos, explosionSingle.name());
result &= getOptionalNumber(pos, explosionSingle.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getChargeTypeId(pos, explosionSingle.chargeTypeId());
result &= getImpactPosition(pos, explosionSingle.impactPosition());
result &= getOptionalNumber(pos, explosionSingle.partyId(), &CentralAesByteReader::getPartyId);
result &= getFireRequestTime(pos, explosionSingle.fireRequestTime());
result &= getAltitude(pos, explosionSingle.altitude());
result &= getPurpose(pos, explosionSingle.purpose());
bool result = getAesItemId(pos, explosionSingle.id);
result &= getName(pos, explosionSingle.name);
result &= getOptionalNumber(pos, explosionSingle.effectStart, &CentralAesByteReader::getEffectStart);
result &= getChargeTypeId(pos, explosionSingle.chargeTypeId);
result &= getImpactPosition(pos, explosionSingle.impactPosition);
result &= getOptionalNumber(pos, explosionSingle.partyId, &CentralAesByteReader::getPartyId);
result &= getFireRequestTime(pos, explosionSingle.fireRequestTime);
result &= getAltitude(pos, explosionSingle.altitude);
result &= getPurpose(pos, explosionSingle.purpose);
DEBUG_LOG(m_logger) << "Got ExplosionSingle:"
<< "\nid = " << explosionSingle.id()
<< "\nname = " << explosionSingle.name()
<< "\neffectStart = " << explosionSingle.effectStart()
<< "\nchargeTypeId = " << explosionSingle.chargeTypeId()
<< "\nimpactPosition = " << explosionSingle.impactPosition()
<< "\npartyId = " << explosionSingle.partyId()
<< "\nfireRequestTime = " << explosionSingle.fireRequestTime()
<< "\naltitude = " << explosionSingle.altitude()
<< "\npurpose = " << explosionSingle.purpose();
<< "\nid = " << explosionSingle.id
<< "\nname = " << explosionSingle.name
<< "\neffectStart = " << explosionSingle.effectStart
<< "\nchargeTypeId = " << explosionSingle.chargeTypeId
<< "\nimpactPosition = " << explosionSingle.impactPosition
<< "\npartyId = " << explosionSingle.partyId
<< "\nfireRequestTime = " << explosionSingle.fireRequestTime
<< "\naltitude = " << explosionSingle.altitude
<< "\npurpose = " << explosionSingle.purpose;
return result;
}
bool CentralAesByteReader::getMineArea(size_t &pos, AreaEffectSimulation::MineAreaModifyRequest &mineArea) const
{
bool result = getAesItemId(pos, mineArea.id());
result &= getName(pos, mineArea.name());
result &= getOptionalNumber(pos, mineArea.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, mineArea.effectDuration());
result &= getDensity(pos, mineArea.density());
result &= getWidth(pos, mineArea.width());
result &= getChargeTypeId(pos, mineArea.chargeStruct().chargeTypeId());
result &= getOptionalNumber(pos, mineArea.partyId(), &CentralAesByteReader::getPartyId);
result &= getAesMaLayingProcedureType(pos, mineArea.layingProcedureType());
result &= getIsLayedHidden(pos, mineArea.isLaidHidden());
result &= getIsCenterLine(pos, mineArea.isCenterLine());
result &= getSegments(pos, mineArea.segments());
bool result = getAesItemId(pos, mineArea.id);
result &= getName(pos, mineArea.name);
result &= getOptionalNumber(pos, mineArea.effectStart, &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, mineArea.effectDuration);
result &= getDensity(pos, mineArea.density);
result &= getWidth(pos, mineArea.width);
result &= getChargeTypeId(pos, mineArea.chargeStruct.chargeTypeId);
result &= getOptionalNumber(pos, mineArea.partyId, &CentralAesByteReader::getPartyId);
result &= getAesMaLayingProcedureType(pos, mineArea.layingProcedureType);
result &= getIsLayedHidden(pos, mineArea.isLaidHidden);
result &= getIsCenterLine(pos, mineArea.isCenterLine);
result &= getSegments(pos, mineArea.segments);
DEBUG_LOG(m_logger) << "Got MineArea:"
<< "\nid = " << mineArea.id()
<< "\nname = " << mineArea.name()
<< "\neffectStart = " << mineArea.effectStart()
<< "\neffectDuration = " << mineArea.effectDuration()
<< "\ndensity = " << mineArea.density()
<< "\nwidth = " << mineArea.width()
<< "\nchargeTypeId = " << mineArea.chargeStruct().chargeTypeId()
<< "\npartyId = " << mineArea.partyId()
<< "\nlayingProcedureType = " << mineArea.layingProcedureType()
<< "\nisLaidHidden = " << mineArea.isLaidHidden()
<< "\nisCenterLine = " << mineArea.isCenterLine()
<< "\nsegments.size = " << mineArea.segments().size();
<< "\nid = " << mineArea.id
<< "\nname = " << mineArea.name
<< "\neffectStart = " << mineArea.effectStart
<< "\neffectDuration = " << mineArea.effectDuration
<< "\ndensity = " << mineArea.density
<< "\nwidth = " << mineArea.width
<< "\nchargeTypeId = " << mineArea.chargeStruct.chargeTypeId
<< "\npartyId = " << mineArea.partyId
<< "\nlayingProcedureType = " << mineArea.layingProcedureType
<< "\nisLaidHidden = " << mineArea.isLaidHidden
<< "\nisCenterLine = " << mineArea.isCenterLine
<< "\nsegments.size = " << mineArea.segments.size();
return result;
}
bool CentralAesByteReader::getFunctionalArea(size_t &pos, AreaEffectSimulation::FunctionalAreaModifyRequest &functionalArea) const
{
bool result = getAesItemId(pos, functionalArea.id());
result &= getName(pos, functionalArea.name());
result &= getOptionalNumber(pos, functionalArea.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, functionalArea.effectDuration());
result &= getChargeTypeId(pos, functionalArea.chargeTypeId());
result &= getArea(pos, functionalArea.area());
result &= getOptionalNumber(pos, functionalArea.partyId(), &CentralAesByteReader::getPartyId);
bool result = getAesItemId(pos, functionalArea.id);
result &= getName(pos, functionalArea.name);
result &= getOptionalNumber(pos, functionalArea.effectStart, &CentralAesByteReader::getEffectStart);
result &= getEffectDuration(pos, functionalArea.effectDuration);
result &= getChargeTypeId(pos, functionalArea.chargeTypeId);
result &= getArea(pos, functionalArea.area);
result &= getOptionalNumber(pos, functionalArea.partyId, &CentralAesByteReader::getPartyId);
std::string pointSymbol;
result &= getPointSymbol(pos, pointSymbol);
if (pointSymbol != std::string())
functionalArea.pointSymbol().set(pointSymbol);
result &= getFunctionalAreaTypeId(pos, functionalArea.functionalAreaTypeId());
result &= getDeconMode(pos, functionalArea.deconMode());
result &= getDeconTime(pos, functionalArea.deconTime());
result &= getMaintMode(pos, functionalArea.maintMode());
result &= getMaintTime(pos, functionalArea.maintTime());
result &= getMedicMode(pos, functionalArea.medicMode());
result &= getMedicTime(pos, functionalArea.medicTime());
functionalArea.pointSymbol.set(pointSymbol);
result &= getFunctionalAreaTypeId(pos, functionalArea.functionalAreaTypeId);
result &= getDeconMode(pos, functionalArea.deconMode);
result &= getDeconTime(pos, functionalArea.deconTime);
result &= getMaintMode(pos, functionalArea.maintMode);
result &= getMaintTime(pos, functionalArea.maintTime);
result &= getMedicMode(pos, functionalArea.medicMode);
result &= getMedicTime(pos, functionalArea.medicTime);
DEBUG_LOG(m_logger) << "Got MineArea:"
<< "\nid = " << functionalArea.id()
<< "\nname = " << functionalArea.name()
<< "\neffectStart = " << functionalArea.effectStart()
<< "\neffectDuration = " << functionalArea.effectDuration()
<< "\nchargeTypeId = " << functionalArea.chargeTypeId()
<< "\narea = " << functionalArea.area()
<< "\npartyId = " << functionalArea.partyId()
<< "\npointSymbol = " << functionalArea.pointSymbol()
<< "\nfunctionalAreaTypeId = " << functionalArea.functionalAreaTypeId()
<< "\ndeconMode = " << functionalArea.deconMode()
<< "\ndeconTime = " << functionalArea.deconTime()
<< "\nmaintMode = " << functionalArea.maintMode()
<< "\nmaintTime = " << functionalArea.maintTime()
<< "\nmedicMode = " << functionalArea.medicMode()
<< "\n medicTime= " << functionalArea.medicTime();
<< "\nid = " << functionalArea.id
<< "\nname = " << functionalArea.name
<< "\neffectStart = " << functionalArea.effectStart
<< "\neffectDuration = " << functionalArea.effectDuration
<< "\nchargeTypeId = " << functionalArea.chargeTypeId
<< "\narea = " << functionalArea.area
<< "\npartyId = " << functionalArea.partyId
<< "\npointSymbol = " << functionalArea.pointSymbol
<< "\nfunctionalAreaTypeId = " << functionalArea.functionalAreaTypeId
<< "\ndeconMode = " << functionalArea.deconMode
<< "\ndeconTime = " << functionalArea.deconTime
<< "\nmaintMode = " << functionalArea.maintMode
<< "\nmaintTime = " << functionalArea.maintTime
<< "\nmedicMode = " << functionalArea.medicMode
<< "\n medicTime= " << functionalArea.medicTime;
return result;
}
bool CentralAesByteReader::getBoobyTrap(size_t &pos, AreaEffectSimulation::BoobyTrapModifyRequest &boobyTrap) const
{
bool result = getAesItemId(pos, boobyTrap.id());
result &= getName(pos, boobyTrap.name());
result &= getEffectDuration(pos, boobyTrap.effectDuration());
result &= getChargeTypeId(pos, boobyTrap.chargeTypeId());
result &= getImpactPosition(pos, boobyTrap.impactPosition());
result &= getImpactRadius(pos, boobyTrap.impactRadius());
result &= getTriggerRadius(pos, boobyTrap.triggerRadius());
result &= getOptionalNumber(pos, boobyTrap.rotationAngle(), &CentralAesByteReader::getRotationAngle);
result &= getOptionalNumber(pos, boobyTrap.centralAngle(), &CentralAesByteReader::getCentralAngle);
result &= getOptionalNumber(pos, boobyTrap.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getOptionalNumber(pos, boobyTrap.partyId(), &CentralAesByteReader::getPartyId);
bool result = getAesItemId(pos, boobyTrap.id);
result &= getName(pos, boobyTrap.name);
result &= getEffectDuration(pos, boobyTrap.effectDuration);
result &= getChargeTypeId(pos, boobyTrap.chargeTypeId);
result &= getImpactPosition(pos, boobyTrap.impactPosition);
result &= getImpactRadius(pos, boobyTrap.impactRadius);
result &= getTriggerRadius(pos, boobyTrap.triggerRadius);
result &= getOptionalNumber(pos, boobyTrap.rotationAngle, &CentralAesByteReader::getRotationAngle);
result &= getOptionalNumber(pos, boobyTrap.centralAngle, &CentralAesByteReader::getCentralAngle);
result &= getOptionalNumber(pos, boobyTrap.effectStart, &CentralAesByteReader::getEffectStart);
result &= getOptionalNumber(pos, boobyTrap.partyId, &CentralAesByteReader::getPartyId);
DEBUG_LOG(m_logger) << "Got BoobyTrap:"
<< "\nid = " << boobyTrap.id()
<< "\nname = " << boobyTrap.name()
<< "\neffectDuration = " << boobyTrap.effectDuration()
<< "\nchargeTypeId = " << boobyTrap.chargeTypeId()
<< "\nimpactPosition = " << boobyTrap.impactPosition()
<< "\nimpactRadius = " << boobyTrap.impactRadius()
<< "\ntriggerRadius = " << boobyTrap.triggerRadius()
<< "\nrotationAngle = " << boobyTrap.rotationAngle()
<< "\ncentralAngle = " << boobyTrap.centralAngle()
<< "\neffectStart = " << boobyTrap.effectStart()
<< "\npartyId = " << boobyTrap.partyId();
<< "\nid = " << boobyTrap.id
<< "\nname = " << boobyTrap.name
<< "\neffectDuration = " << boobyTrap.effectDuration
<< "\nchargeTypeId = " << boobyTrap.chargeTypeId
<< "\nimpactPosition = " << boobyTrap.impactPosition
<< "\nimpactRadius = " << boobyTrap.impactRadius
<< "\ntriggerRadius = " << boobyTrap.triggerRadius
<< "\nrotationAngle = " << boobyTrap.rotationAngle
<< "\ncentralAngle = " << boobyTrap.centralAngle
<< "\neffectStart = " << boobyTrap.effectStart
<< "\npartyId = " << boobyTrap.partyId;
return result;
}
bool CentralAesByteReader::getOffRouteMine(size_t &pos, AreaEffectSimulation::OffRouteMineModifyRequest &offRouteMine) const
{
bool result = getAesItemId(pos, offRouteMine.id());
result &= getName(pos, offRouteMine.name());
result &= getEffectDuration(pos, offRouteMine.effectDuration());
result &= getChargeTypeId(pos, offRouteMine.chargeTypeId());
result &= getArea(pos, offRouteMine.area());
result &= getOptionalNumber(pos, offRouteMine.impactRadius(), &CentralAesByteReader::getImpactRadius);
result &= getOptionalNumber(pos, offRouteMine.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getOptionalNumber(pos, offRouteMine.partyId(), &CentralAesByteReader::getPartyId);
bool result = getAesItemId(pos, offRouteMine.id);
result &= getName(pos, offRouteMine.name);
result &= getEffectDuration(pos, offRouteMine.effectDuration);
result &= getChargeTypeId(pos, offRouteMine.chargeTypeId);
result &= getArea(pos, offRouteMine.area);
result &= getOptionalNumber(pos, offRouteMine.impactRadius, &CentralAesByteReader::getImpactRadius);
result &= getOptionalNumber(pos, offRouteMine.effectStart, &CentralAesByteReader::getEffectStart);
result &= getOptionalNumber(pos, offRouteMine.partyId, &CentralAesByteReader::getPartyId);
DEBUG_LOG(m_logger) << "Got OffRouteMine: "
<< "\nid: " << offRouteMine.id()
<< "\nname = " << offRouteMine.name()
<< "\neffectDuration = " << offRouteMine.effectDuration()
<< "\nchargeTypeId = " << offRouteMine.chargeTypeId()
<< "\narea = " << offRouteMine.area()
<< "\nimpactRadius = " << offRouteMine.impactRadius()
<< "\neffectStart = " << offRouteMine.effectStart()
<< "\npartyId = " << offRouteMine.partyId();
<< "\nid: " << offRouteMine.id
<< "\nname = " << offRouteMine.name
<< "\neffectDuration = " << offRouteMine.effectDuration
<< "\nchargeTypeId = " << offRouteMine.chargeTypeId
<< "\narea = " << offRouteMine.area
<< "\nimpactRadius = " << offRouteMine.impactRadius
<< "\neffectStart = " << offRouteMine.effectStart
<< "\npartyId = " << offRouteMine.partyId;
return result;
}
bool CentralAesByteReader::getExplosionCluster(size_t &pos, AreaEffectSimulation::ExplosionClusterOcModifyRequest &explosionCluster) const
{
bool result = getAesItemId(pos, explosionCluster.id());
result &= getName(pos, explosionCluster.name());
result &= getEffectStart(pos, explosionCluster.effectStart());
result &= getEffectDuration(pos, explosionCluster.effectDuration());
result &= getArea(pos, explosionCluster.area());
result &= getMhpCount(pos, explosionCluster.mhpCount());
result &= getMhpRotation(pos, explosionCluster.mhpRotation());
result &= getImpactCount(pos, explosionCluster.impactCount());
result &= getChargeTypeId(pos, explosionCluster.chargeStruct().chargeTypeId());
result &= getPartyId(pos, explosionCluster.partyId());
bool result = getAesItemId(pos, explosionCluster.id);
result &= getName(pos, explosionCluster.name);
result &= getEffectStart(pos, explosionCluster.effectStart);
result &= getEffectDuration(pos, explosionCluster.effectDuration);
result &= getArea(pos, explosionCluster.area);
result &= getMhpCount(pos, explosionCluster.mhpCount);
result &= getMhpRotation(pos, explosionCluster.mhpRotation);
result &= getImpactCount(pos, explosionCluster.impactCount);
result &= getChargeTypeId(pos, explosionCluster.chargeStruct.chargeTypeId);
result &= getPartyId(pos, explosionCluster.partyId);
DEBUG_LOG(m_logger) << "Got ExplosionCluster:"
<< "\nid: " << explosionCluster.id()
<< "\nname: " << explosionCluster.name()
<< "\neffectStart: " << explosionCluster.effectStart()
<< "\neffectDuration: " << explosionCluster.effectDuration()
<< "\narea: " << explosionCluster.area()
<< "\nmhpCount: " << explosionCluster.mhpCount()
<< "\nmhpRotation: " << explosionCluster.mhpRotation()
<< "\nimpactCount: " << explosionCluster.impactCount()
<< "\nchargeTypeId: " << explosionCluster.chargeStruct().chargeTypeId()
<< "\npartyId: " << explosionCluster.partyId();
<< "\nid: " << explosionCluster.id
<< "\nname: " << explosionCluster.name
<< "\neffectStart: " << explosionCluster.effectStart
<< "\neffectDuration: " << explosionCluster.effectDuration
<< "\narea: " << explosionCluster.area
<< "\nmhpCount: " << explosionCluster.mhpCount
<< "\nmhpRotation: " << explosionCluster.mhpRotation
<< "\nimpactCount: " << explosionCluster.impactCount
<< "\nchargeTypeId: " << explosionCluster.chargeStruct.chargeTypeId
<< "\npartyId: " << explosionCluster.partyId;
return result;
}
@@ -337,10 +337,10 @@ bool CentralAesByteReader::getAltitude(size_t &pos, int32_t &altitude) const
bool CentralAesByteReader::getArea(size_t &pos, AreaEffectSimulation::Area &area) const
{
bool result = getPosition2D(pos, area.cornerBottomLeft());
result &= LtsUtils::get8Byte(m_data, pos, area.width());
result &= LtsUtils::get8Byte(m_data, pos, area.height());
result &= LtsUtils::get8Byte(m_data, pos, area.rotation());
bool result = getPosition2D(pos, area.cornerBottomLeft);
result &= LtsUtils::get8Byte(m_data, pos, area.width);
result &= LtsUtils::get8Byte(m_data, pos, area.height);
result &= LtsUtils::get8Byte(m_data, pos, area.rotation);
return result;
}
@@ -526,8 +526,8 @@ bool CentralAesByteReader::getPointSymbol(size_t &pos, std::string &pointSymbol)
bool CentralAesByteReader::getPosition2D(size_t &pos, Core::GeoPosition2D &position) const
{
bool result = LtsUtils::get8Byte(m_data, pos, position.lon());
result &= LtsUtils::get8Byte(m_data, pos, position.lat());
bool result = LtsUtils::get8Byte(m_data, pos, position.lon);
result &= LtsUtils::get8Byte(m_data, pos, position.lat);
return result;
}