From 2bacd06062b06ce100dd8cee522581674e4172cf Mon Sep 17 00:00:00 2001
From: Louis Moureaux <m_louis30@yahoo.com>
Date: Tue, 26 Mar 2024 23:54:20 +0100
Subject: [PATCH] Warn about non-transport FerryBoat units

The FerryBoat flag is only meaningful for units that can transport. Warn when
the flag is set for non-transport units, and unset it. This prevents an
assertion failure later on.

Closes #2238.
---
 server/ruleset.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/server/ruleset.cpp b/server/ruleset.cpp
index 7e0aa06a6c..73d1518262 100644
--- a/server/ruleset.cpp
+++ b/server/ruleset.cpp
@@ -65,6 +65,7 @@
 #include "script_server.h"
 
 #include "ruleset.h"
+#include "unittype.h"
 
 // RULESET_SUFFIX already used, no leading dot here
 #define RULES_SUFFIX "ruleset"
@@ -2303,6 +2304,15 @@ static bool load_ruleset_units(struct section_file *file,
         ok = false;
         break;
       }
+
+      // L_FERRYBOAT makes the AI consider the unit as a transport.
+      // Ensure it can actually transport something.
+      if (utype_has_role(u, L_FERRYBOAT) && u->transport_capacity == 0) {
+        qCWarning(ruleset_category,
+                  "\"%s\": Unit %s has FerryBoat flag but cannot transport",
+                  filename, utype_rule_name(u));
+        BV_CLR(u->roles, L_FERRYBOAT - L_FIRST);
+      }
     }
     unit_type_iterate_end;
   }