Feature: Increase railtype/roadtype limit

.github/dependabot.yml

@@ -8,3 +8,5 @@ updates:
     actions:
       patterns:
       - "*"
+  commit-message:
+    prefix: "Upgrade: "

.github/workflows/codeql.yml

@@ -21,6 +21,7 @@ jobs:
       actions: read
       contents: read
       security-events: write
+      packages: read
 
     steps:
     - name: Checkout

CONTRIBUTING.md

@@ -196,6 +196,29 @@ These include:
 You may also want the guide to [compiling OpenTTD](./COMPILING.md).
 
 
+## Use of AI
+
+OpenTTD is a labour of love, created by people.
+
+Please refrain from submitting issues or pull requests that have been generated by an LLM or other fully-automated tools.
+Any submission that is in violation of this policy will be closed, and the submitter may be blocked from this repository without warning.
+
+If you submit an issue, you need to understand what your issue description is saying.
+You need to be able to answer questions about your bug report or feature request.
+Using an AI tool to _proofread_ your issue/comment text is acceptable. Using an AI tool to _write_ your issue/comment text is not.
+
+If you submit a pull request, you need to understand what every line of code you've changed does.
+If you can't explain why your PR is doing something, then do not submit it.
+Using an AI tool to generate entire lines of code is unacceptable.
+
+The rationale behind this policy is that automated contributions are a waste of the maintainers' time.
+Humans spend their time and brainpower reviewing every submission.
+Issues or pull requests generated by automation tools create an imbalance of effort between the submitter and the reviewer.
+Nobody learns anything when a maintainer reviews code written by an LLM.
+
+Additionally, AI-generated code conflicts with this project's license (GPL v2), since you cannot truly release code for use if you didn't author it yourself.
+
+
 ## Project goals
 
 ### What are the goals of the official branch?

cmake/scripts/Regression.cmake

@@ -25,6 +25,10 @@ if(EDITBIN_EXECUTABLE)
     execute_process(COMMAND ${EDITBIN_EXECUTABLE} /nologo /subsystem:console ${OPENTTD_EXECUTABLE})
 endif()
 
+# Remove previous crash files
+file(GLOB CRASH_FILES "regression/crash*")
+file(REMOVE ${CRASH_FILES})
+
 # Run the regression test
 execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                         -x
@@ -40,6 +44,13 @@ execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                 OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+# Detect any crash
+file(GLOB CRASH_FILES "regression/crash*.log")
+if (CRASH_FILES)
+    file(READ ${CRASH_FILES} CRASH_LOG)
+    message(FATAL_ERROR "OpenTTD crashed: ${CRASH_LOG}")
+endif()
+
 if(REGRESSION_OUTPUT)
     message(FATAL_ERROR "Unexpected output: ${REGRESSION_OUTPUT}")
 endif()

media/baseset/openttd.grf.hash

@@ -1 +1 @@
-eb8390a0569e66ec417c64ad254f9d05
+b779126d7cd1567eb09a0a7871f70a71

media/baseset/openttd/CMakeLists.txt

@@ -10,6 +10,7 @@ if(GRFCODEC_FOUND)
                          ${CMAKE_CURRENT_SOURCE_DIR}/airport_preview.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/aqueduct.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/autorail.nfo
+                         ${CMAKE_CURRENT_SOURCE_DIR}/bridge_decks.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/canals.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/chars.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/elrails.nfo
@@ -31,6 +32,7 @@ if(GRFCODEC_FOUND)
                          ${CMAKE_CURRENT_SOURCE_DIR}/airport_preview.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/aqueduct.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/autorail.png
+                         ${CMAKE_CURRENT_SOURCE_DIR}/bridge_decks.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/canals.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/canal_locks.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/chars.png

media/baseset/openttd/bridge_decks.nfo

@@ -0,0 +1,36 @@
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+//
+   -1 * 0	 0C "Bridge decks"
+   -1 * 3	 05 1B 18
+
+   -1 sprites/bridge_decks.png 8bpp   96  16  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   16  16  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176  16  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256  16  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336  16  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416  16  64  39 -31   -8 normal
+
+   -1 sprites/bridge_decks.png 8bpp   96  71  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   16  71  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176  71  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256  71  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336  71  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416  71  64  39 -31   -8 normal
+
+   -1 sprites/bridge_decks.png 8bpp   96 126  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   16 126  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176 126  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256 126  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336 126  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416 126  64  39 -31   -8 normal
+
+// X and Y axis are swapped for road surface.
+   -1 sprites/bridge_decks.png 8bpp   16 181  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   96 181  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176 181  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256 181  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336 181  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416 181  64  39 -31   -8 normal

media/baseset/openttd/openttd.nfo

@@ -100,3 +100,4 @@
 #include "palette.nfo"
 #include "road_waypoints.nfo"
 #include "overlay_rocks.nfo"
+#include "bridge_decks.nfo"

regression/regression/main.nut

@@ -461,6 +461,21 @@ function Regression::Company()
 	}
 }
 
+function Regression::CompanyGender()
+{
+	print("");
+	print("--Company Gender--");
+	/* Check gender switching behaviour matches API. */
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+	print("  SetPresidentGender():              " + AICompany.SetPresidentGender(AICompany.GENDER_MALE));
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+	print("  SetPresidentGender():              " + AICompany.SetPresidentGender(AICompany.GENDER_FEMALE));
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+	/* Setting to existing gender should fail. */
+	print("  SetPresidentGender():              " + AICompany.SetPresidentGender(AICompany.GENDER_FEMALE));
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+}
+
 function Regression::Engine()
 {
 	local j = 0;
@@ -2096,6 +2111,7 @@ function Regression::Start()
 	this.Vehicle();
 	/* Order has to be after Vehicle */
 	this.Order();
+	this.CompanyGender();
 	print("");
 	print("  First Subsidy Test");
 	PrintSubsidy(0);

regression/regression/result.txt

@@ -10006,6 +10006,15 @@ ERROR: IsEnd() is invalid as Begin() is never called
   foreach():
     20 => 23596
 
+--Company Gender--
+  GetPresidentGender():              1
+  SetPresidentGender():              true
+  GetPresidentGender():              0
+  SetPresidentGender():              true
+  GetPresidentGender():              1
+  SetPresidentGender():              false
+  GetPresidentGender():              1
+
   First Subsidy Test
       --Subsidy (0) --
         IsValidSubsidy():      true
@@ -10107,7 +10116,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
 constructor failed with: excessive CPU usage in list filter function
 Your script made an error: excessive CPU usage in valuator function
 
-*FUNCTION [Start()] regression/main.nut line [2168]
+*FUNCTION [Start()] regression/main.nut line [2184]
 
 [Infinite] CLOSURE
 [list] INSTANCE

src/CMakeLists.txt

@@ -541,6 +541,7 @@ add_files(
     transparency.h
     transparency_gui.cpp
     transparency_gui.h
+    transport_mapping.hpp
     transport_type.h
     tree_cmd.cpp
     tree_cmd.h

src/ai/ai_gui.cpp

@@ -28,7 +28,7 @@
 
 
 /** Widgets for the configure AI window. */
-static constexpr NWidgetPart _nested_ai_config_widgets[] = {
+static constexpr std::initializer_list<NWidgetPart> _nested_ai_config_widgets = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_MAUVE),
 		NWidget(WWT_CAPTION, COLOUR_MAUVE), SetStringTip(STR_AI_CONFIG_CAPTION_AI, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),

src/ai/ai_scanner.cpp

@@ -137,5 +137,5 @@ AILibrary *AIScannerLibrary::FindLibrary(const std::string &library, int version
 	ScriptInfoList::iterator it = this->info_list.find(library_name);
 	if (it == this->info_list.end()) return nullptr;
 
-	return static_cast<AILibrary *>((*it).second);
+	return static_cast<AILibrary *>(it->second);
 }

src/aircraft_cmd.cpp

@@ -16,7 +16,6 @@
 #include "news_func.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
-#include "spritecache.h"
 #include "error_func.h"
 #include "strings_func.h"
 #include "command_func.h"
@@ -136,7 +135,9 @@ static StationID FindNearestHangar(const Aircraft *v)
 			next_dest = Station::GetIfValid(v->current_order.GetDestination().ToStationID());
 		} else {
 			last_dest = GetTargetAirportIfValid(v);
-			next_dest = Station::GetIfValid(v->GetNextStoppingStation().value);
+			std::vector<StationID> next_station;
+			v->GetNextStoppingStation(next_station);
+			if (!next_station.empty()) next_dest = Station::GetIfValid(next_station.back());
 		}
 	}
 
@@ -200,7 +201,7 @@ void GetRotorImage(const Aircraft *v, EngineImageType image_type, VehicleSpriteS
 static void GetAircraftIcon(EngineID engine, EngineImageType image_type, VehicleSpriteSeq *result)
 {
 	const Engine *e = Engine::Get(engine);
-	uint8_t spritenum = e->u.air.image_index;
+	uint8_t spritenum = e->VehInfo<AircraftVehicleInfo>().image_index;
 
 	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleIcon(engine, DIR_W, image_type, result);
@@ -267,7 +268,7 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height, int &xoff
  */
 CommandCost CmdBuildAircraft(DoCommandFlags flags, TileIndex tile, const Engine *e, Vehicle **ret)
 {
-	const AircraftVehicleInfo *avi = &e->u.air;
+	const AircraftVehicleInfo *avi = &e->VehInfo<AircraftVehicleInfo>();
 	const Station *st = Station::GetByTile(tile);
 
 	/* Prevent building aircraft types at places which can't handle them */
@@ -438,7 +439,7 @@ static void CheckIfAircraftNeedsService(Aircraft *v)
 Money Aircraft::GetRunningCost() const
 {
 	const Engine *e = this->GetEngine();
-	uint cost_factor = GetVehicleProperty(this, PROP_AIRCRAFT_RUNNING_COST_FACTOR, e->u.air.running_cost);
+	uint cost_factor = GetVehicleProperty(this, PROP_AIRCRAFT_RUNNING_COST_FACTOR, e->VehInfo<AircraftVehicleInfo>().running_cost);
 	return GetPrice(PR_RUNNING_AIRCRAFT, cost_factor, e->GetGRF());
 }
 

src/aircraft_gui.cpp

@@ -14,7 +14,6 @@
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "window_gui.h"
-#include "spritecache.h"
 #include "zoom_func.h"
 
 #include "table/strings.h"

src/airport_gui.cpp

@@ -84,7 +84,7 @@ static void PlaceAirport(TileIndex tile)
 
 /** Airport build toolbar window handler. */
 struct BuildAirToolbarWindow : Window {
-	int last_user_action = INVALID_WID_AT; // Last started user action.
+	WidgetID last_user_action = INVALID_WIDGET; // Last started user action.
 
 	BuildAirToolbarWindow(WindowDesc &desc, WindowNumber window_number) : Window(desc)
 	{
@@ -161,6 +161,11 @@ struct BuildAirToolbarWindow : Window {
 		VpSelectTilesWithMethod(pt.x, pt.y, select_method);
 	}
 
+	Point OnInitialPosition(int16_t sm_width, [[maybe_unused]] int16_t sm_height, [[maybe_unused]] int window_number) override
+	{
+		return AlignInitialConstructionToolbar(sm_width);
+	}
+
 	void OnPlaceMouseUp([[maybe_unused]] ViewportPlaceMethod select_method, ViewportDragDropSelectionProcess select_proc, [[maybe_unused]] Point pt, TileIndex start_tile, TileIndex end_tile) override
 	{
 		if (pt.x != -1 && select_proc == DDSP_DEMOLISH_AREA) {
@@ -197,7 +202,7 @@ struct BuildAirToolbarWindow : Window {
 	}, AirportToolbarGlobalHotkeys};
 };
 
-static constexpr NWidgetPart _nested_air_toolbar_widgets[] = {
+static constexpr std::initializer_list<NWidgetPart> _nested_air_toolbar_widgets = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN),
 		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN), SetStringTip(STR_TOOLBAR_AIRCRAFT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -211,7 +216,7 @@ static constexpr NWidgetPart _nested_air_toolbar_widgets[] = {
 };
 
 static WindowDesc _air_toolbar_desc(
-	WDP_ALIGN_TOOLBAR, "toolbar_air", 0, 0,
+	WDP_MANUAL, "toolbar_air", 0, 0,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WindowDefaultFlag::Construction,
 	_nested_air_toolbar_widgets,
@@ -580,7 +585,7 @@ class BuildAirportWindow : public PickerWindowBase {
 	}};
 };
 
-static constexpr NWidgetPart _nested_build_airport_widgets[] = {
+static constexpr std::initializer_list<NWidgetPart> _nested_build_airport_widgets = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN),
 		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN), SetStringTip(STR_STATION_BUILD_AIRPORT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),

src/articulated_vehicles.cpp

@@ -365,10 +365,10 @@ void AddArticulatedParts(Vehicle *first)
 				t->track = front->track;
 				t->railtypes = front->railtypes;
 
-				t->spritenum = e_artic->u.rail.image_index;
+				t->spritenum = e_artic->VehInfo<RailVehicleInfo>().image_index;
 				if (e_artic->CanCarryCargo()) {
 					t->cargo_type = e_artic->GetDefaultCargoType();
-					t->cargo_cap = e_artic->u.rail.capacity;  // Callback 36 is called when the consist is finished
+					t->cargo_cap = e_artic->VehInfo<RailVehicleInfo>().capacity;  // Callback 36 is called when the consist is finished
 				} else {
 					t->cargo_type = front->cargo_type; // Needed for livery selection
 					t->cargo_cap = 0;
@@ -392,11 +392,11 @@ void AddArticulatedParts(Vehicle *first)
 				rv->roadtype = front->roadtype;
 				rv->compatible_roadtypes = front->compatible_roadtypes;
 
-				rv->spritenum = e_artic->u.road.image_index;
+				rv->spritenum = e_artic->VehInfo<RoadVehicleInfo>().image_index;
 				if (e_artic->CanCarryCargo()) {
 					rv->cargo_type = e_artic->GetDefaultCargoType();
 					assert(IsValidCargoType(rv->cargo_type));
-					rv->cargo_cap = e_artic->u.road.capacity;  // Callback 36 is called when the consist is finished
+					rv->cargo_cap = e_artic->VehInfo<RoadVehicleInfo>().capacity;  // Callback 36 is called when the consist is finished
 				} else {
 					rv->cargo_type = front->cargo_type; // Needed for livery selection
 					rv->cargo_cap = 0;

src/autoreplace_cmd.cpp

@@ -71,24 +71,24 @@ bool CheckAutoreplaceValidity(EngineID from, EngineID to, CompanyID company)
 	switch (type) {
 		case VEH_TRAIN: {
 			/* make sure the railtypes are compatible */
-			if (!GetAllCompatibleRailTypes(e_from->u.rail.railtypes).Any(GetAllCompatibleRailTypes(e_to->u.rail.railtypes))) return false;
+			if (!GetAllCompatibleRailTypes(e_from->VehInfo<RailVehicleInfo>().railtypes).Any(GetAllCompatibleRailTypes(e_to->VehInfo<RailVehicleInfo>().railtypes))) return false;
 
 			/* make sure we do not replace wagons with engines or vice versa */
-			if ((e_from->u.rail.railveh_type == RAILVEH_WAGON) != (e_to->u.rail.railveh_type == RAILVEH_WAGON)) return false;
+			if ((e_from->VehInfo<RailVehicleInfo>().railveh_type == RAILVEH_WAGON) != (e_to->VehInfo<RailVehicleInfo>().railveh_type == RAILVEH_WAGON)) return false;
 			break;
 		}
 
 		case VEH_ROAD:
 			/* make sure the roadtypes are compatible */
-			if (!GetRoadTypeInfo(e_from->u.road.roadtype)->powered_roadtypes.Any(GetRoadTypeInfo(e_to->u.road.roadtype)->powered_roadtypes)) return false;
+			if (!GetRoadTypeInfo(e_from->VehInfo<RoadVehicleInfo>().roadtype)->powered_roadtypes.Any(GetRoadTypeInfo(e_to->VehInfo<RoadVehicleInfo>().roadtype)->powered_roadtypes)) return false;
 
 			/* make sure that we do not replace a tram with a normal road vehicles or vice versa */
 			if (e_from->info.misc_flags.Test(EngineMiscFlag::RoadIsTram) != e_to->info.misc_flags.Test(EngineMiscFlag::RoadIsTram)) return false;
 			break;
 
 		case VEH_AIRCRAFT:
 			/* make sure that we do not replace a plane with a helicopter or vice versa */
-			if ((e_from->u.air.subtype & AIR_CTOL) != (e_to->u.air.subtype & AIR_CTOL)) return false;
+			if ((e_from->VehInfo<AircraftVehicleInfo>().subtype & AIR_CTOL) != (e_to->VehInfo<AircraftVehicleInfo>().subtype & AIR_CTOL)) return false;
 			break;
 
 		default: break;

src/autoreplace_cmd.h

@@ -18,7 +18,7 @@
 CommandCost CmdAutoreplaceVehicle(DoCommandFlags flags, VehicleID veh_id);
 CommandCost CmdSetAutoReplace(DoCommandFlags flags, GroupID id_g, EngineID old_engine_type, EngineID new_engine_type, bool when_old);
 
-DEF_CMD_TRAIT(CMD_AUTOREPLACE_VEHICLE, CmdAutoreplaceVehicle, {}, CMDT_VEHICLE_MANAGEMENT)
-DEF_CMD_TRAIT(CMD_SET_AUTOREPLACE,     CmdSetAutoReplace,     {}, CMDT_VEHICLE_MANAGEMENT)
+DEF_CMD_TRAIT(CMD_AUTOREPLACE_VEHICLE, CmdAutoreplaceVehicle, {}, CommandType::VehicleManagement)
+DEF_CMD_TRAIT(CMD_SET_AUTOREPLACE,     CmdSetAutoReplace,     {}, CommandType::VehicleManagement)
 
 #endif /* AUTOREPLACE_CMD_H */