From 9ea49d66808c5e12edf3cd53552fcd3979ba139b Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Tue, 2 Jan 2024 14:48:57 +0000
Subject: [PATCH] Only compile OrderList::DebugCheckSanity when WITH_ASSERT
 defined

---
 src/openttd.cpp            | 2 ++
 src/order_base.h           | 2 ++
 src/order_cmd.cpp          | 4 +++-
 src/saveload/afterload.cpp | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/openttd.cpp b/src/openttd.cpp
index 5333ac892a..a924281909 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1981,9 +1981,11 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log, CheckC
 			}
 		}
 
+#ifdef WITH_ASSERT
 		for (OrderList *order_list : OrderList::Iterate()) {
 			order_list->DebugCheckSanity();
 		}
+#endif
 
 		extern void ValidateVehicleTickCaches();
 		ValidateVehicleTickCaches();
diff --git a/src/order_base.h b/src/order_base.h
index 9158dd6d0d..e835a129b3 100644
--- a/src/order_base.h
+++ b/src/order_base.h
@@ -967,7 +967,9 @@ public:
 
 	void FreeChain(bool keep_orderlist = false);
 
+#ifdef WITH_ASSERT
 	void DebugCheckSanity() const;
+#endif
 	bool CheckOrderListIndexing() const;
 
 	inline std::vector<DispatchSchedule> &GetScheduledDispatchScheduleSet() { return this->dispatch_schedules; }
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 2443eda693..0c86c95c52 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -840,6 +840,7 @@ bool OrderList::IsCompleteTimetable() const
 	return true;
 }
 
+#ifdef WITH_ASSERT
 /**
  * Checks for internal consistency of order list. Triggers assertion if something is wrong.
  */
@@ -878,6 +879,7 @@ void OrderList::DebugCheckSanity() const
 			this->num_vehicles, this->timetable_duration, this->total_duration);
 	assert(this->CheckOrderListIndexing());
 }
+#endif
 
 /**
  * Checks whether the order goes to a station or not, i.e. whether the
@@ -2822,7 +2824,7 @@ void CheckOrders(const Vehicle *v)
 		/* Do we only have 1 station in our order list? */
 		if (n_st < 2 && message == INVALID_STRING_ID) message = STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS;
 
-#ifndef NDEBUG
+#ifdef WITH_ASSERT
 		if (v->orders != nullptr) v->orders->DebugCheckSanity();
 #endif
 
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 2c1220a832..a2da218641 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -3972,9 +3972,11 @@ bool AfterLoadGame()
 				}
 			}
 		}
+#ifdef WITH_ASSERT
 		for (OrderList *order_list : OrderList::Iterate()) {
 			order_list->DebugCheckSanity();
 		}
+#endif
 	}
 
 	if (SlXvIsFeaturePresent(XSLFI_TRAIN_THROUGH_LOAD, 0, 1)) {