Merge pull request #4776 from SJuliez/minor

Minor issues
MegaMek · Sep 13, 2023 · 7047342 · 7047342
2 parents cf2f2ae + ea9919b
commit 7047342
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/lobby/LobbyMekCellFormatter.java b/megamek/src/megamek/client/ui/swing/lobby/LobbyMekCellFormatter.java
@@ -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>");
             }
         }

diff --git a/megamek/src/megamek/common/verifier/TestSupportVehicle.java b/megamek/src/megamek/common/verifier/TestSupportVehicle.java
@@ -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;