Merge remote-tracking branch 'upstream/master'

2024-02-07 15:20:07 +05:30
parent 36001f85d1 13e20ba192
commit ee0718e08a
176 changed files with 3476 additions and 2711 deletions
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -213,7 +213,7 @@ static StringID GetAircraftEngineInfoString(const Engine *e)
 	SetDParam(9, mail_capacity > 0 ? STR_ENGINE_PREVIEW_CAPACITY_2 : STR_ENGINE_PREVIEW_CAPACITY);
 	SetDParam(10, cargo);
 	SetDParam(11, capacity);
-	SetDParam(12, CT_MAIL);
+	SetDParam(12, GetCargoIDByLabel(CT_MAIL));
 	SetDParam(13, mail_capacity);

 	return STR_ENGINE_PREVIEW_TEXT4;