Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Ext/SWType/Body.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ void SWTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->LimboDelivery_Types.Read(exINI, pSection, "LimboDelivery.Types");
this->LimboDelivery_IDs.Read(exINI, pSection, "LimboDelivery.IDs");
this->LimboDelivery_RollChances.Read(exINI, pSection, "LimboDelivery.RollChances");
this->LimboKill_AffectsHouse.Read(exINI, pSection, "LimboKill.Affected"); // Temporary solution for the INI tags renaming issue, see #2093
this->LimboKill_AffectsHouse.Read(exINI, pSection, "LimboKill.AffectsHouse");
this->LimboKill_IDs.Read(exINI, pSection, "LimboKill.IDs");
this->LimboKill_Counts.Read(exINI, pSection, "LimboKill.Counts");
Expand Down
3 changes: 3 additions & 0 deletions src/Ext/TechnoType/Body.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,9 @@ void TechnoTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->OpenTransport_RangeBonus.Read(exINI, pSection, "OpenTransport.RangeBonus");
this->OpenTransport_DamageMultiplier.Read(exINI, pSection, "OpenTransport.DamageMultiplier");

this->AutoTargetOwnPosition.Read(exINI, pSection, "AutoFire"); // Temporary solution for the INI tags renaming issue, see #2093
this->AutoTargetOwnPosition.Read(exINI, pSection, "AutoTargetOwnPosition");
this->AutoTargetOwnPosition_Self.Read(exINI, pSection, "AutoFire.TargetSelf"); // Temporary solution for the INI tags renaming issue, see #2093
this->AutoTargetOwnPosition_Self.Read(exINI, pSection, "AutoTargetOwnPosition.Self");

this->NoSecondaryWeaponFallback.Read(exINI, pSection, "NoSecondaryWeaponFallback");
Expand Down Expand Up @@ -1007,6 +1009,7 @@ void TechnoTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->Tint_VisibleToHouses.Read(exINI, pSection, "Tint.VisibleToHouses");

this->RevengeWeapon.Read<true>(exINI, pSection, "RevengeWeapon");
this->RevengeWeapon_AffectsHouse.Read(exINI, pSection, "RevengeWeapon.AffectsHouses"); // Temporary solution for the INI tags renaming issue, see #2093
this->RevengeWeapon_AffectsHouse.Read(exINI, pSection, "RevengeWeapon.AffectsHouse");

this->RecountBurst.Read(exINI, pSection, "RecountBurst");
Expand Down
10 changes: 10 additions & 0 deletions src/Ext/WarheadType/Body.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,18 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->Crit_ExtraDamage_ApplyFirepowerMult.Read(exINI, pSection, "Crit.ExtraDamage.ApplyFirepowerMult");
this->Crit_Warhead.Read<true>(exINI, pSection, "Crit.Warhead");
this->Crit_Warhead_FullDetonation.Read(exINI, pSection, "Crit.Warhead.FullDetonation");
this->Crit_AffectsTarget.Read(exINI, pSection, "Crit.Affects"); // Temporary solution for the INI tags renaming issue, see #2093
this->Crit_AffectsTarget.Read(exINI, pSection, "Crit.AffectsTarget");
this->Crit_AffectsHouse.Read(exINI, pSection, "Crit.AffectsHouses"); // Temporary solution for the INI tags renaming issue, see #2093
this->Crit_AffectsHouse.Read(exINI, pSection, "Crit.AffectsHouse");
this->Crit_AnimList.Read(exINI, pSection, "Crit.AnimList");
this->Crit_AnimList_PickRandom.Read(exINI, pSection, "Crit.AnimList.PickRandom");
this->Crit_AnimList_CreateAll.Read(exINI, pSection, "Crit.AnimList.CreateAll");
this->Crit_ActiveChanceAnims.Read(exINI, pSection, "Crit.ActiveChanceAnims");
this->Crit_AnimOnAffectedTargets.Read(exINI, pSection, "Crit.AnimOnAffectedTargets");
this->Crit_AffectsBelowPercent.Read(exINI, pSection, "Crit.AffectBelowPercent"); // Temporary solution for the INI tags renaming issue, see #2093
this->Crit_AffectsBelowPercent.Read(exINI, pSection, "Crit.AffectsBelowPercent");
this->Crit_AffectsAbovePercent.Read(exINI, pSection, "Crit.AffectAbovePercent"); // Temporary solution for the INI tags renaming issue, see #2093
this->Crit_AffectsAbovePercent.Read(exINI, pSection, "Crit.AffectsAbovePercent");
this->Crit_SuppressWhenIntercepted.Read(exINI, pSection, "Crit.SuppressWhenIntercepted");

Expand Down Expand Up @@ -249,7 +253,9 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->DetonateOnAllMapObjects.Read(exINI, pSection, "DetonateOnAllMapObjects");
this->DetonateOnAllMapObjects_Full.Read(exINI, pSection, "DetonateOnAllMapObjects.Full");
this->DetonateOnAllMapObjects_RequireVerses.Read(exINI, pSection, "DetonateOnAllMapObjects.RequireVerses");
this->DetonateOnAllMapObjects_AffectsTarget.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectTargets"); // Temporary solution for the INI tags renaming issue, see #2093
this->DetonateOnAllMapObjects_AffectsTarget.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectsTarget");
this->DetonateOnAllMapObjects_AffectsHouse.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectHouses"); // Temporary solution for the INI tags renaming issue, see #2093
this->DetonateOnAllMapObjects_AffectsHouse.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectsHouse");
this->DetonateOnAllMapObjects_AffectTypes.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectTypes");
this->DetonateOnAllMapObjects_IgnoreTypes.Read(exINI, pSection, "DetonateOnAllMapObjects.IgnoreTypes");
Expand Down Expand Up @@ -294,9 +300,13 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)

this->KillWeapon.Read(exINI, pSection, "KillWeapon");
this->KillWeapon_OnFirer.Read(exINI, pSection, "KillWeapon.OnFirer");
this->KillWeapon_AffectsHouse.Read(exINI, pSection, "KillWeapon.AffectsHouses"); // Temporary solution for the INI tags renaming issue, see #2093
this->KillWeapon_AffectsHouse.Read(exINI, pSection, "KillWeapon.AffectsHouse");
this->KillWeapon_OnFirer_AffectsHouse.Read(exINI, pSection, "KillWeapon.OnFirer.AffectsHouses"); // Temporary solution for the INI tags renaming issue, see #2093
this->KillWeapon_OnFirer_AffectsHouse.Read(exINI, pSection, "KillWeapon.OnFirer.AffectsHouse");
this->KillWeapon_AffectsTarget.Read(exINI, pSection, "KillWeapon.Affects"); // Temporary solution for the INI tags renaming issue, see #2093
this->KillWeapon_AffectsTarget.Read(exINI, pSection, "KillWeapon.AffectsTarget");
this->KillWeapon_OnFirer_AffectsTarget.Read(exINI, pSection, "KillWeapon.OnFirer.Affects"); // Temporary solution for the INI tags renaming issue, see #2093
this->KillWeapon_OnFirer_AffectsTarget.Read(exINI, pSection, "KillWeapon.OnFirer.AffectsTarget");

this->ElectricAssaultLevel.Read(exINI, pSection, "ElectricAssaultLevel");
Expand Down
3 changes: 3 additions & 0 deletions src/New/Type/Affiliated/TypeConvertGroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ void TypeConvertGroup::Parse(std::vector<TypeConvertGroup>& list, INI_EX& exINI,
convertFrom.Read(exINI, pSection, tempBuffer);
_snprintf_s(tempBuffer, sizeof(tempBuffer), "Convert%d.To", i);
convertTo.Read(exINI, pSection, tempBuffer);
_snprintf_s(tempBuffer, sizeof(tempBuffer), "Convert%d.AffectedHouses", i); // Temporary solution for the INI tags renaming issue, see #2093
convertAffectsHouse.Read(exINI, pSection, tempBuffer);
_snprintf_s(tempBuffer, sizeof(tempBuffer), "Convert%d.AffectsHouse", i);
convertAffectsHouse.Read(exINI, pSection, tempBuffer);

Expand All @@ -72,6 +74,7 @@ void TypeConvertGroup::Parse(std::vector<TypeConvertGroup>& list, INI_EX& exINI,
Nullable<AffectedHouse> convertAffectsHouse;
convertFrom.Read(exINI, pSection, "Convert.From");
convertTo.Read(exINI, pSection, "Convert.To");
convertAffectsHouse.Read(exINI, pSection, "Convert.AffectedHouses"); // Temporary solution for the INI tags renaming issue, see #2093
convertAffectsHouse.Read(exINI, pSection, "Convert.AffectsHouse");
if (convertTo.isset())
{
Expand Down
3 changes: 3 additions & 0 deletions src/New/Type/AttachEffectTypeClass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ void AttachEffectTypeClass::LoadFromINI(CCINIClass* pINI)
this->PenetratesForceShield.Read(exINI, pSection, "PenetratesForceShield");
this->AffectTypes.Read(exINI, pSection, "AffectTypes");
this->IgnoreTypes.Read(exINI, pSection, "IgnoreTypes");
this->AffectsTarget.Read(exINI, pSection, "AffectTargets"); // Temporary solution for the INI tags renaming issue, see #2093
this->AffectsTarget.Read(exINI, pSection, "AffectsTarget");

this->Animation.Read(exINI, pSection, "Animation");
Expand Down Expand Up @@ -147,13 +148,15 @@ void AttachEffectTypeClass::LoadFromINI(CCINIClass* pINI)
this->Crit_DisallowWarheads.Read(exINI, pSection, "Crit.DisallowWarheads");

this->RevengeWeapon.Read<true>(exINI, pSection, "RevengeWeapon");
this->RevengeWeapon_AffectsHouse.Read(exINI, pSection, "RevengeWeapon.AffectsHouses"); // Temporary solution for the INI tags renaming issue, see #2093
this->RevengeWeapon_AffectsHouse.Read(exINI, pSection, "RevengeWeapon.AffectsHouse");
this->RevengeWeapon_UseInvokerAsOwner.Read(exINI, pSection, "RevengeWeapon.UseInvokerAsOwner");

this->ReflectDamage.Read(exINI, pSection, "ReflectDamage");
this->ReflectDamage_Warhead.Read(exINI, pSection, "ReflectDamage.Warhead");
this->ReflectDamage_Warhead_Detonate.Read(exINI, pSection, "ReflectDamage.Warhead.Detonate");
this->ReflectDamage_Multiplier.Read(exINI, pSection, "ReflectDamage.Multiplier");
this->ReflectDamage_AffectsHouse.Read(exINI, pSection, "ReflectDamage.AffectsHouses"); // Temporary solution for the INI tags renaming issue, see #2093
this->ReflectDamage_AffectsHouse.Read(exINI, pSection, "ReflectDamage.AffectsHouse");
this->ReflectDamage_Chance.Read(exINI, pSection, "ReflectDamage.Chance");
this->ReflectDamage_Override.Read(exINI, pSection, "ReflectDamage.Override");
Expand Down