Military::removeFromSquad: Add missing history event when unassigning officer
#5269
Conversation
This file contains 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
myk002
reviewed
Feb 11, 2025
library/modules/Military.cpp
Outdated
| @@ -389,6 +394,19 @@ static void remove_officer_entity_link(df::historical_figure* hf, df::squad* squ | |||
| former_pos->link_strength = 100; | |||
|
|
|||
| hf->entity_links.push_back(former_pos); | |||
|
|
|||
| int32_t event_id = *df::global::hist_event_next_id; | |||
There was a problem hiding this comment.
Suggested change
| int32_t event_id = *df::global::hist_event_next_id; | |
| int32_t event_id = (*df::global::hist_event_next_id)++; |
There was a problem hiding this comment.
this should work, allowing you to remove the explicit increment below
There was a problem hiding this comment.
Yep, I tested that earlier before publishing this but could not tell which would be visually neater. if you prefer it I will do just that.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Minor and virtually cosmetic change for consistency's sake.