mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: NewGRF roadstops were ignored if only in default class. (#12089) 

If a NewGRF defines roadstops in the default class and no other classes are defined, they would be ignored and not selectable.
pull/12091/head
Peter Nelson 2024-02-14 19:21:13 +00:00 committed by GitHub
parent ac5eaecd15
commit 4ffe1da540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf_roadstop.cpp
View File

@ -464,11 +464,12 @@ void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTri
*/ */
bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype) bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype)
{ {
if (!(RoadStopClass::GetClassCount() > 1 || RoadStopClass::Get(ROADSTOP_CLASS_DFLT)->GetSpecCount() > 1)) return false;
for (uint i = 0; i < RoadStopClass::GetClassCount(); i++) { for (uint i = 0; i < RoadStopClass::GetClassCount(); i++) {
// We don't want to check the default or waypoint classes. These classes are always available. /* Ignore the waypoint class. */
if (i == ROADSTOP_CLASS_DFLT || i == ROADSTOP_CLASS_WAYP) continue; if (i == ROADSTOP_CLASS_WAYP) continue;
RoadStopClass *roadstopclass = RoadStopClass::Get((RoadStopClassID)i); const RoadStopClass *roadstopclass = RoadStopClass::Get((RoadStopClassID)i);
/* Ignore the default class with only the default station. */
if (i == ROADSTOP_CLASS_DFLT && roadstopclass->GetSpecCount() == 1) continue;
if (GetIfClassHasNewStopsByType(roadstopclass, rs, roadtype)) return true; if (GetIfClassHasNewStopsByType(roadstopclass, rs, roadtype)) return true;
} }
return false; return false;
@ -481,7 +482,7 @@ bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype)
* @param roadtype the RoadType to check. * @param roadtype the RoadType to check.
* @return true if the RoadStopSpec has any specs compatible with the given RoadStopType and RoadType. * @return true if the RoadStopSpec has any specs compatible with the given RoadStopType and RoadType.
*/ */
bool GetIfClassHasNewStopsByType(RoadStopClass *roadstopclass, RoadStopType rs, RoadType roadtype) bool GetIfClassHasNewStopsByType(const RoadStopClass *roadstopclass, RoadStopType rs, RoadType roadtype)
{ {
for (uint j = 0; j < roadstopclass->GetSpecCount(); j++) { for (uint j = 0; j < roadstopclass->GetSpecCount(); j++) {
if (GetIfStopIsForType(roadstopclass->GetSpec(j), rs, roadtype)) return true; if (GetIfStopIsForType(roadstopclass->GetSpec(j), rs, roadtype)) return true;

2
src/newgrf_roadstop.h
View File

@ -173,7 +173,7 @@ void TriggerRoadStopAnimation(BaseStation *st, TileIndex tile, StationAnimationT
void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoID cargo_type = INVALID_CARGO); void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoID cargo_type = INVALID_CARGO);
bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype); bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype);
bool GetIfClassHasNewStopsByType(RoadStopClass *roadstopclass, RoadStopType rs, RoadType roadtype); bool GetIfClassHasNewStopsByType(const RoadStopClass *roadstopclass, RoadStopType rs, RoadType roadtype);
bool GetIfStopIsForType(const RoadStopSpec *roadstopspec, RoadStopType rs, RoadType roadtype); bool GetIfStopIsForType(const RoadStopSpec *roadstopspec, RoadStopType rs, RoadType roadtype);
uint GetCountOfCompatibleStopsByType(RoadStopClass *roadstopclass, RoadStopType rs); uint GetCountOfCompatibleStopsByType(RoadStopClass *roadstopclass, RoadStopType rs);