Skip to content
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.

Sign up for GitHub

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

Issue 6264: Destroyed Infantry no longer have negative weight #6263

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Issue 6264: Destroyed Infantry no longer have negative weight #6263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
585aacb
Issue 5336: Destroyed Infantry no longer have negative weight
psikomonkie Dec 14, 2024
6e22374
Issue MekHQ 5336: Use 0 active troopers instead of forcing it to 0 tons
psikomonkie Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions megamek/src/megamek/common/verifier/TestInfantry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,9 @@ public static double getWeightExact(Infantry infantry, CalculationReport report)

InfantryMount mount = infantry.getMount();
int activeTroopers = infantry.getInternal(Infantry.LOC_INFANTRY);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like making this
int activeTroopers = Math.max(0, infantry.getInternal(Infantry.LOC_INFANTRY));
would do it more concisely

if (activeTroopers < 0) {
activeTroopers = 0;
}
double weight;

if (mount != null) {
Expand Down
Loading