-
Notifications
You must be signed in to change notification settings - Fork 164
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.
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
Make the escort list show ship names as well as callsigns. #5523
Make the escort list show ship names as well as callsigns. #5523
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The game_settings.tbl options would provide the most flexibility, but as a solution to the current issue, I think using the same behavior as the target box would work. This would display "Shipname" for ships without a callsign, and "Shipname (Callsign)" for ships with one. This solution preserves seeing the ship name in all cases, while also satisfying the needs of multiplayer.
I share the same opinion as Goober. It would be consistent with other feature(s) in the code at a bare minimum. |
In scp-fs2open#5477, I made the escort list respect hidden names by copying the behavior from `message_queue_process()`, which already checked those flags; however, this resulted in some dramatic behavioral changes for mods using callsigns for escort ships, and while making the behavior optional was a possibility, feedback suggested everyone would rather it just behaved like the target box and displayed both. So I replaced the code with similar logic from hudtargetbox.cpp, except with the "replace hidden name with ship class" code taking priority.
b2af081
to
b5dd823
Compare
Code is no longer the same as reviewed.
I've changed the code to (mostly) match the target box behavior. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
As a follow-up to scp-fs2open#5523, some mods use callsigns for their ships but prefer not to display the callsigns in the escort list. In lieu of a more flexible way to configure escort lists, a simple flag is sufficient to implement the desired behavior.
In #5477, I made the escort list respect hidden names by copying the behavior from
message_queue_process()
, which already checked those flags; however, this resulted in some dramatic behavioral changes for mods using callsigns for escort ships, so making the "replace ship name with callsign" part of the code optional, and disabled by default, should result in minimal changes for existing mods while still fixing the bug of the escort list not hiding ship names properly, and still allowing mods to show callsigns in the escort list if they do want that.Tagging this as "regression" because it's not strictly a bug, but affects backwards-compatibility nonetheless. Making this a draft because I don't want to change this again without some proper feedback along the lines of: should it append the callsign instead, like the target window? Should there be more than just two options (like, say,
$Escort callsign behavior: NEVER
)? @Goober5000 made this suggestion on Discord, but it would be significantly more involved to implement:Further questions about this concept: would each instance of ship names being shown have three options, one for if a callsign is set, one for if the name is hidden, and one for if neither of the above is true? Or would there be some sort of conditional syntax to make things be/not be shown based on some other thing? You have to do something more, because otherwise
$name ($callsign)
would result in empty parentheses for ships without callsigns.