Skip to content

Fix two small issues - #7690

Merged
wookieejedi merged 2 commits into
scp-fs2open:masterfrom
wookieejedi:small-fixes
Aug 8, 2026
Merged

Fix two small issues#7690
wookieejedi merged 2 commits into
scp-fs2open:masterfrom
wookieejedi:small-fixes

Conversation

@wookieejedi

Copy link
Copy Markdown
Member

Fix copy-paste bug where setting $Ask Help Hull Percent: never properly got set. Fortunately this does not affect the AI, only when the AI sends a message to the player asking for help.

Fix edge-case issue: in find_turret_enemy, the turret-tgt-ship-tgt shortcut takes the parent ship's target and indexes Ships[] with it unconditionally, but aip->target_objnum could be a weapon or asteroid, which could be at an index higher than the ships index, and then trying to look up team could lead to bad data.

Fix copy-paste bug where setting `$Ask Help Hull Percent:` never properly got set. Fortunately this does not affect the AI, only when the AI sends a message to the player asking for help.

Fix edge-case issue: in `find_turret_enemy`, the `turret-tgt-ship-tgt` shortcut takes the parent ship's target and indexes Ships[] with it unconditionally, but `aip->target_objnum` could be a weapon or asteroid, which could be at an index higher than the ships index, and then trying to look up team could lead to bad data.
@wookieejedi wookieejedi added this to the Release 26.0.1 milestone Aug 6, 2026
@wookieejedi wookieejedi added the fix A fix for bugs, not-a-bugs, and/or regressions. label Aug 6, 2026
@wookieejedi wookieejedi added the Point Release Candidate An already merged bugfix that may be merged into a previous stable version label Aug 7, 2026
@wookieejedi
wookieejedi merged commit 35d8c6e into scp-fs2open:master Aug 8, 2026
18 checks passed
@wookieejedi
wookieejedi deleted the small-fixes branch August 8, 2026 14:26
wookieejedi added a commit that referenced this pull request Aug 8, 2026
* Fix two small issues

Fix copy-paste bug where setting `$Ask Help Hull Percent:` never properly got set. Fortunately this does not affect the AI, only when the AI sends a message to the player asking for help.

Fix edge-case issue: in `find_turret_enemy`, the `turret-tgt-ship-tgt` shortcut takes the parent ship's target and indexes Ships[] with it unconditionally, but `aip->target_objnum` could be a weapon or asteroid, which could be at an index higher than the ships index, and then trying to look up team could lead to bad data.

* comment formatting
@wookieejedi wookieejedi added added to point release and removed Point Release Candidate An already merged bugfix that may be merged into a previous stable version labels Aug 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

added to point release fix A fix for bugs, not-a-bugs, and/or regressions.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants