Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
@@ -422,7 +422,7 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT
|
||||
|
||||
sendResumeEffectSimulation(data);
|
||||
}
|
||||
else if (!data.effectStart.is_set() ||
|
||||
else if (!data.effectStart.has_value() ||
|
||||
data.effectStart.get() == 0 ||
|
||||
data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved ||
|
||||
data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
|
||||
@@ -700,14 +700,14 @@ void setCommonParams(T &out, const S &in, const int aesTetraId)
|
||||
Q_UNUSED(aesTetraId);
|
||||
|
||||
out.name = in.name;
|
||||
out.partyId = in.partyId.is_set() ? in.partyId.get() : 0;
|
||||
out.partyId = in.partyId.has_value() ? in.partyId.get() : 0;
|
||||
}
|
||||
|
||||
template<typename T, typename S>
|
||||
void setCommonCombatParams(T &out, const S &in, const int aesTetraId)
|
||||
{
|
||||
setCommonParams(out, in, aesTetraId);
|
||||
out.effectStart = in.effectStart.is_set() ? in.effectStart.get() : 0;
|
||||
out.effectStart = in.effectStart.has_value() ? in.effectStart.get() : 0;
|
||||
out.effectDuration = in.effectDuration;
|
||||
}
|
||||
|
||||
@@ -1275,7 +1275,7 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
|
||||
aes.originalEffectDuration,
|
||||
aes.effectDuration);
|
||||
dAes.nextImpact = aes.remainExplosionNumber;
|
||||
dAes.resumeTime = aes.effectStart.is_set() ? aes.effectStart.get() : 0;
|
||||
dAes.resumeTime = aes.effectStart.has_value() ? aes.effectStart.get() : 0;
|
||||
dAes.remainDuration = aes.effectDuration;
|
||||
|
||||
txData(dAes);
|
||||
@@ -1315,7 +1315,7 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
|
||||
aes.originalEffectDuration,
|
||||
aes.effectDuration);
|
||||
dAes.nextImpact = aes.remainExplosionNumber;
|
||||
dAes.resumeTime = aes.effectStart.is_set() ? aes.effectStart.get() : 0;
|
||||
dAes.resumeTime = aes.effectStart.has_value() ? aes.effectStart.get() : 0;
|
||||
dAes.remainDuration = aes.effectDuration;
|
||||
|
||||
txData(dAes);
|
||||
|
||||
Reference in new issue
Block a user