Store the support rearm pool sparsely - #7758
Open
Goober5000 wants to merge 1 commit into
Open
Conversation
Goober5000
added
the
refactor
Goober5000
force-pushed
the
refactor/rearm_weapon_pool
branch
from
August 31, 2026 03:47
1de072a to
22dcf1f
Compare
Goober5000
marked this pull request as ready for review
August 31, 2026 03:48
Goober5000
force-pushed
the
refactor/rearm_weapon_pool
branch
from
August 31, 2026 04:00
22dcf1f to
a946337
Compare
`support_ship_info::rearm_weapon_pool` was a dense per-weapon-class array where -1 = unlimited (the default), 0 = not rearmable, and >0 = remaining stockpile. Convert it to a sparse per-team map: `std::array<SCP_map<int, int>, MAX_TVT_TEAMS> rearm_weapon_pool;` `int rearm_pool_default() const; // -1, or 0 under rearm_pool_from_loadout` Mission-file format and save output are unchanged. Also tightens the two weapon-class bounds checks in ship.cpp. This removes another `MAX_WEAPON_TYPES` sized structure on the way to lifting the weapon class limit. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Goober5000
force-pushed
the
refactor/rearm_weapon_pool
branch
from
September 2, 2026 03:16
a946337 to
4e4929d
Compare
wookieejedi
approved these changes
Sep 2, 2026
wookieejedi
left a comment
wookieejedi
left a comment
Member
There was a problem hiding this comment.
Updated changes now look good, thanks!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
support_ship_info::rearm_weapon_poolwas a dense per-weapon-class array where -1 = unlimited (the default), 0 = not rearmable, and >0 = remaining stockpile. Convert it to a sparse per-team map:std::array<SCP_map<int, int>, MAX_TVT_TEAMS> rearm_weapon_pool;int rearm_pool_default() const; // -1, or 0 under rearm_pool_from_loadoutMission-file format and save output are unchanged. Also tightens the two weapon-class bounds checks in ship.cpp. This removes another
MAX_WEAPON_TYPESsized structure on the way to lifting the weapon class limit.In draft as it depends on #7757.