fix persistent variables and containers #7192
Open
+176
−301
Conversation
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
Goober5000
added
cleanup
Goober5000
force-pushed
the
variable_fix
branch
4 times, most recently
from
0f0de2a to
ef67aec
Compare
jg18
reviewed
Jan 19, 2026
Goober5000
force-pushed
the
variable_fix
branch
from
ef67aec to
adbfb8a
Compare
Storage of persistent variables had been broken since scp-fs2open#1631 -- the player-persistent variable code would inadvertently not run if there were no campaign-persistent variables. Additionally, there were several places where the persistent variable logic was hard to follow, which could have hidden other related bugs. This fixes the check and cleans up and consolidates the relevant functions.
Goober5000
force-pushed
the
variable_fix
branch
from
adbfb8a to
98ecb98
Compare
jg18
reviewed
Jan 21, 2026
Member
jg18
left a comment
jg18
left a comment
There was a problem hiding this comment.
Still reading, but adding a few thoughts.
jg18
reviewed
Jan 21, 2026
jg18
reviewed
Jan 21, 2026
code/mission/missioncampaign.cpp
Outdated
| } | ||
| if (store_red_alert) { | ||
| for (auto& current_rav : Campaign.red_alert_variables) { | ||
| Campaign.persistent_variables.push_back(current_rav); |
Member
There was a problem hiding this comment.
We should probably check for naming collisions between existing persistent variables and the RA variables we're adding. Ditto for containers.
jg18
reviewed
Jan 21, 2026
code/mission/missioncampaign.cpp
Outdated
| } else if (any(persistence_type & ContainerType::SAVE_ON_MISSION_PROGRESS) && | ||
| any(container.type & persistence_type) && container.is_eternal()) { | ||
| // we might need to save some eternal player-persistent containers | ||
| if (!any(container.type & persistence_type)) { |
jg18
requested changes
Jan 23, 2026
Member
jg18
left a comment
jg18
left a comment
There was a problem hiding this comment.
Still studying, but one concern.
| int num_mission_variables = sexp_campaign_file_variable_count(); | ||
| int num_sexp_variables = sexp_variable_count(); | ||
| for (int i = 0; i < num_sexp_variables; i++) { | ||
| if (!(Sexp_variables[i].type & persistence_type)) { |
Member
There was a problem hiding this comment.
The code assumes all "set" variables are packed to the left in Sexp_variables. Can we be 110% sure that will always be true?
I suggest
for (int i = 0; i < MAX_SEXP_VARIABLES; i++) {
if (!(Sexp_variables[i].type & (SEXP_VARIABLE_SET | persistence_type))) {
continue;
}
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.
Storage of persistent variables had been broken since #1631 -- the player-persistent variable code would inadvertently not run if there were no campaign-persistent variables. Additionally, there were several places where the persistent variable logic was hard to follow, which could have hidden other related bugs. This fixes the check and cleans up and consolidates the relevant functions.