fix ship select roster scroll-up getting stuck after list shrinks#7501
Merged
Conversation
After a drag-drop that consumed the last unit of a roster class, the active list could shrink while SS_active_list_start was non-zero, making items above the stuck offset (including default ships returned to the pool, such as Seth fighters) unreachable: the up-arrow handler short-circuits when size <= max_show without resetting the offset. - Clamp the preserved scroll offset in ss_synch_interface() against SS_active_list_size - MAX_ICONS_ON_SCREEN. - Harden common_scroll_down_pressed() to reset *start to 0 when the whole list fits on screen. Fixes scp-fs2open#6240 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
JohnAFernandez
approved these changes
Jun 5, 2026
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
3 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.
After a drag-drop that consumed the last unit of a roster class, the active list could shrink while SS_active_list_start was non-zero, making items above the stuck offset (including default ships returned to the pool, such as Seth fighters) unreachable: the up-arrow handler short-circuits when size <= max_show without resetting the offset.
Fixes #6240. Tested on the same Scroll mission from the stream, Thor's Hammer.