mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2025-12-10 06:52:05 +01:00
Code Issues Releases Wiki Activity

Change: [Script] Decouple RAILTYPE_INVALID from internal presentation. (#14630)

Browse Source 
RAILTYPE_INVALID is now -1, which matches ROADTYPE_INVALID.
This commit is contained in:
Peter Nelson
2025-09-19 22:02:08 +01:00
committed by GitHub
parent 264cbd8ab5
commit 68e37b7b50
3 changed files with 250 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

488
regression/regression/result.txt
View File

File diff suppressed because it is too large Load Diff

5
src/script/api/script_engine.cpp
View File

@@ -242,7 +242,10 @@
if (!IsValidEngine(engine_id)) return ScriptRail::RAILTYPE_INVALID; if (!IsValidEngine(engine_id)) return ScriptRail::RAILTYPE_INVALID;
if (GetVehicleType(engine_id) != ScriptVehicle::VT_RAIL) return ScriptRail::RAILTYPE_INVALID; if (GetVehicleType(engine_id) != ScriptVehicle::VT_RAIL) return ScriptRail::RAILTYPE_INVALID;
return static_cast<ScriptRail::RailType>(::RailVehInfo(engine_id)->railtypes.GetNthSetBit(0).value_or(::RailType::INVALID_RAILTYPE)); auto railtype = ::RailVehInfo(engine_id)->railtypes.GetNthSetBit(0);
if (!railtype.has_value()) return ScriptRail::RAILTYPE_INVALID;
return static_cast<ScriptRail::RailType>(railtype.value());
} }
/* static */ ScriptList *ScriptEngine::GetAllRailTypes(EngineID engine_id) /* static */ ScriptList *ScriptEngine::GetAllRailTypes(EngineID engine_id)

5
src/script/api/script_rail.hpp
View File

@@ -44,9 +44,8 @@ public:
/** /**
* Types of rail known to the game. * Types of rail known to the game.
*/ */
enum RailType : uint8_t { enum RailType {
/* Note: these values represent part of the in-game static values */ RAILTYPE_INVALID = -1, ///< Invalid RailType.
RAILTYPE_INVALID = ::INVALID_RAILTYPE, ///< Invalid RailType.
}; };
/** /**