dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Set up default station/waypoint classes properly. (#10789)

Browse Source
This commit is contained in:
PeterN
2023-05-08 16:42:01 +01:00
committed by GitHub
parent c4e6d80ecf
commit bc6a4b1d08
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf_roadstop.cpp
View File

@@ -31,13 +31,10 @@ template <typename Tspec, typename Tid, Tid Tmax>
void NewGRFClass<Tspec, Tid, Tmax>::InsertDefaults() void NewGRFClass<Tspec, Tid, Tmax>::InsertDefaults()
{ {
/* Set up initial data */ /* Set up initial data */
classes[0].global_id = 'DFLT'; RoadStopClass::Get(RoadStopClass::Allocate('DFLT'))->name = STR_STATION_CLASS_DFLT;
classes[0].name = STR_STATION_CLASS_DFLT; RoadStopClass::Get(RoadStopClass::Allocate('DFLT'))->Insert(nullptr);
classes[0].Insert(nullptr); RoadStopClass::Get(RoadStopClass::Allocate('WAYP'))->name = STR_STATION_CLASS_WAYP;
RoadStopClass::Get(RoadStopClass::Allocate('WAYP'))->Insert(nullptr);
classes[1].global_id = 'WAYP';
classes[1].name = STR_STATION_CLASS_WAYP;
classes[1].Insert(nullptr);
} }
template <typename Tspec, typename Tid, Tid Tmax> template <typename Tspec, typename Tid, Tid Tmax>

11
src/newgrf_station.cpp
View File

@@ -32,13 +32,10 @@ template <typename Tspec, typename Tid, Tid Tmax>
/* static */ void NewGRFClass<Tspec, Tid, Tmax>::InsertDefaults() /* static */ void NewGRFClass<Tspec, Tid, Tmax>::InsertDefaults()
{ {
/* Set up initial data */ /* Set up initial data */
classes[0].global_id = 'DFLT'; StationClass::Get(StationClass::Allocate('DFLT'))->name = STR_STATION_CLASS_DFLT;
classes[0].name = STR_STATION_CLASS_DFLT; StationClass::Get(StationClass::Allocate('DFLT'))->Insert(nullptr);
classes[0].Insert(nullptr); StationClass::Get(StationClass::Allocate('WAYP'))->name = STR_STATION_CLASS_WAYP;
StationClass::Get(StationClass::Allocate('WAYP'))->Insert(nullptr);
classes[1].global_id = 'WAYP';
classes[1].name = STR_STATION_CLASS_WAYP;
classes[1].Insert(nullptr);
} }
template <typename Tspec, typename Tid, Tid Tmax> template <typename Tspec, typename Tid, Tid Tmax>