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.

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

Minor issues #4776

Merged
merged 2 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static String formatUnitFull(Entity entity, ChatLounge lobby, boolean forceView)
if (entity.isShutDown()) {
result.append(DOT_SPACER);
result.append(guiScaledFontHTML(GUIP.getWarningColor()));
result.append("\u23FC ").append(Messages.getString("ChatLounge.shutdown"));
result.append(WARNING_SIGN).append(Messages.getString("ChatLounge.shutdown"));
result.append("</FONT>");
}
}
Expand Down
6 changes: 5 additions & 1 deletion megamek/src/megamek/common/verifier/TestSupportVehicle.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,18 @@ static Set<SVType> allBut(SVType first, SVType... rest) {
}

/**
* Finds the enum value corresponding to a support vehicle based on movement mode.
* Finds the enum value corresponding to a support vehicle.
*
* @param entity The support vehicle
* @return The support vehicle type, or {@code null} if the entity's movement type is not
* a valid one for a support vehicle.
*/
public static @Nullable
SVType getVehicleType(Entity entity) {
// When grounded, FWS revert to wheeled movement mode; must be independent of this
if (entity instanceof FixedWingSupport) {
return FIXED_WING;
}
switch (entity.getMovementMode()) {
case AIRSHIP:
return AIRSHIP;
Expand Down