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
@@ -70,10 +70,10 @@ HandlerBase::HandlerBase(MainHandler *mainHandler,
|
||||
s_mineAreaCreationInterval = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/mineAreaCreationInterval"),20000).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtBCContamination] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralBCContamination"),defaultMaxDecBCNContaminations).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtNContamination] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralNContamination"),defaultMaxDecBCNContaminations).toInt();
|
||||
|
||||
// Keep equal as the totalAreas sums the actual active areas up and compares to either N or BC
|
||||
@@ -83,15 +83,15 @@ HandlerBase::HandlerBase(MainHandler *mainHandler,
|
||||
|
||||
// Keep equal as the totalAreas sums the actual active areas up and compares to either Area or Single
|
||||
// It is not distinguished any more. Therefore 50 (as the sum) ist the actual value for All Explosion Areas
|
||||
s_maxActiveAreas[AesType::AtExplosionArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralExplosionAreas"),defaultMaxDecExplosions).toInt();
|
||||
s_maxActiveAreas[AesType::AtExplosionSingle] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralExplosionSingle"),defaultMaxDecExplosions).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtExplosionCluster] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralExplosionClusters"),defaultMaxDecExplosionCluster).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtMineArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralMineAreas"),defaultMaxDecMineAreas).toInt();
|
||||
|
||||
|
||||
@@ -105,60 +105,60 @@ HandlerBase::HandlerBase(MainHandler *mainHandler,
|
||||
s_safePzAbwWMiCount = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/reservePzAbwWMi"),defaultReservePzAbwWMi).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtFunctionalArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtFunctionalArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralFunctionalAreas"),defaultMaxDecFunctionalAreas).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtTechnicalArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtTechnicalArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralTechnicalAreas"),defaultMaxDecTechnicalAreas).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtGasPipe] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtGasPipe)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralGasPipes"),defaultMaxDecGasPipes).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtDusSingleMine] = nglSettings->settings()->value(
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtDusSingleMine)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveDecentralDusSingleMines"),defaultMaxDecDusSingleMines).toInt();
|
||||
|
||||
s_maxActiveAreas[AesType::AtAirSupportImpact] = 2147483647; // unlimited
|
||||
s_maxActiveAreas[static_cast<int>(AesType::AtAirSupportImpact)] = 2147483647; // unlimited
|
||||
|
||||
// Central
|
||||
s_maxActiveAreasCentral[AesType::AtBoobyTrap] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtBoobyTrap)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralBoobyTraps"),defaultMaxCenBoobyTraps).toInt();
|
||||
s_maxActiveAreasCentral[AesType::AtBCContamination] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralBCContamination"),defaultMaxCenBCNContaminations).toInt();
|
||||
s_maxActiveAreasCentral[AesType::AtNContamination] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralNContamination"),defaultMaxCenBCNContaminations).toInt();
|
||||
|
||||
// Keep equal as the totalAreas sums the actual active areas up and compares to either Area or Single
|
||||
// It is not distinguished any more. Therefore 200 (as the sum) ist the actual value for All Explosion Areas
|
||||
s_maxActiveAreasCentral[AesType::AtExplosionArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralExplosionAreas"),defaultMaxCenExplosions).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtExplosionSingle] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionSingle)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralExplosionSingle"),defaultMaxCenExplosions).toInt();
|
||||
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtOffRouteMine] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralOffRouteMines"),defaultMaxCenOffRouteMines).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtMineArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralMineAreas"),defaultMaxCenMineAreas).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtFunctionalArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtFunctionalArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralFunctionalAreas"),defaultMaxCenFunctionalAreas).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtTechnicalArea] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtTechnicalArea)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralTechnicalAreas"),defaultMaxCenTechnicalAreas).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtGasPipe] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtGasPipe)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralGasPipes"),defaultMaxCenGasPipes).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtDusSingleMine] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtDusSingleMine)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralDusSingleMines"),defaultMaxCenDusSingleMines).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtExplosionCluster] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralExplosionClusters"),defaultMaxCenExplosionCluster).toInt();
|
||||
s_maxActiveAreasCentral[AesType::AtEffectCluster] = nglSettings->settings()->value(
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtEffectCluster)] = nglSettings->settings()->value(
|
||||
QStringLiteral("AES/maxActiveCentralEffectClusters"),defaultMaxCenEffectCluster).toInt();
|
||||
|
||||
s_maxActiveAreasCentral[AesType::AtAirSupportImpact] =
|
||||
s_maxActiveAreasCentral[static_cast<int>(AesType::AtAirSupportImpact)] =
|
||||
2147483647; // unlimited
|
||||
}
|
||||
Reference in new issue
Block a user