Skip to content

Fix the filtering mechanism of weapon range bonus effect in AE #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeathFishAtEase wants to merge 2 commits into
base: develop
Choose a base branch
from
+35 −0
Open

Fix the filtering mechanism of weapon range bonus effect in AE #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88f0125
initial
DeathFishAtEase May 3, 2026
c83a669
WarheadTypeFindOrAllocate
DeathFishAtEase May 3, 2026
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 docs/Whats-New.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ Phobos fixes:
- Fixed combat light ignoring / behaving differently from vanilla game regarding detail level and framerate checks (by Starkku)
- Fixed a bug causing transfering AttachEffects (e.g on `DeploysInto`/`UndeploysInto`) not to immediately recalculate stats or tint (by Starkku)
- Fixed a bug where updating the `OpenTopped` attribute during convert did not update the coordinates of passengers (by NetsuNegi)
- Fixed the bug where `WeaponRange.AllowWeapons` and `WeaponRange.DisallowWeapons` only support weapons listed in the `[WeaponTypes]` list (by Noble_Fish)

Fixes / interactions with other extensions:
<!-- - Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus) -->
Expand Down
34 changes: 34 additions & 0 deletions src/Utilities/TemplateDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1679,6 +1679,40 @@ void __declspec(noinline) ValueableVector<T>::Read(INI_EX& parser, const char* p
}
}

// Specialization: use FindOrAllocate for weapon vectors, avoiding dependency on [WeaponTypes] registration
Copy link
Copy Markdown
Contributor

@TaranDahl TaranDahl May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not for every abstracttype?

Copy link
Copy Markdown
Collaborator Author

@DeathFishAtEase DeathFishAtEase May 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of the principle of minimizing impact
Or rather, I'm not sure how large a scope it is safe to expand to, and if you think it would be better to do so, I'm afraid I would have to ask for your help.

template <>
inline void ValueableVector<WeaponTypeClass*>::Read(INI_EX& parser, const char* pSection, const char* pKey)
{
if (parser.ReadString(pSection, pKey))
{
this->clear();
char* str = parser.value();
char* context = nullptr;
for (char* cur = strtok_s(str, Phobos::readDelims, &context); cur; cur = strtok_s(nullptr, Phobos::readDelims, &context))
{
if (auto pWeapon = WeaponTypeClass::FindOrAllocate(cur))
this->push_back(pWeapon);
}
}
}

// Specialization: use FindOrAllocate for warhead vectors, avoiding dependency on [Warheads] table
template <>
inline void ValueableVector<WarheadTypeClass*>::Read(INI_EX& parser, const char* pSection, const char* pKey)
{
if (parser.ReadString(pSection, pKey))
{
this->clear();
char* str = parser.value();
char* context = nullptr;
for (char* cur = strtok_s(str, Phobos::readDelims, &context); cur; cur = strtok_s(nullptr, Phobos::readDelims, &context))
{
if (auto pWarhead = WarheadTypeClass::FindOrAllocate(cur))
this->push_back(pWarhead);
}
}
}

template <typename T>
bool ValueableVector<T>::Load(PhobosStreamReader& Stm, bool RegisterForChange)
{
Expand Down
Loading