Fix seemingly incorrect round counter handling #5545
Merged
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
kuronekochomusuke
approved these changes
Jun 5, 2024
SJuliez
added a commit
to SJuliez/megamek
that referenced
this pull request
Aug 13, 2024
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.
This corrects the round counter. From looking at it I believe the code has for a long time not been doing what it looked like it was doing. Specifically, the if (!game.shouldDeployThisRound()) check only ever returned true for start-of-game deployment, not reinforcements.
My recent changes restored the function to what it looked to be doing (and which I did not entirely understand) which meant that round counting now no longer progressed when reinforcements were due. This PR fixes it by removing the check entirely. Line 1867 of GameManager is the only place where the round count is ever increased so it has to do it without exception. To get initial deployment at round 0, it has to start at -1.
Hopefully
Fixes #5542