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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/core/format.hpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/group_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc/endian_buffer.hpp
#	src/music/music_driver.hpp
#	src/newgrf_gui.cpp
#	src/rail_cmd.cpp
#	src/road_gui.cpp
#	src/settings_type.h
#	src/strgen/strgen.cpp
#	src/strings.cpp
#	src/timetable_cmd.cpp
#	src/town.h
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/widgets/road_widget.h
This commit is contained in:
Jonathan G Rennison
2023-12-16 23:54:58 +00:00
parent e9612338ff 96ec9c1b47
commit 5ae74ecf8e
130 changed files with 1765 additions and 1676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/table/railtypes.h
View File

@@ -99,7 +99,7 @@ static const RailTypeInfo _original_railtypes[] = {
0,
/* rail type label */
'RAIL',
RAILTYPE_LABEL_RAIL,
/* alternate labels */
RailTypeLabelList(),
@@ -209,7 +209,7 @@ static const RailTypeInfo _original_railtypes[] = {
0,
/* rail type label */
'ELRL',
RAILTYPE_LABEL_ELECTRIC,
/* alternate labels */
RailTypeLabelList(),
@@ -315,7 +315,7 @@ static const RailTypeInfo _original_railtypes[] = {
0,
/* rail type label */
'MONO',
RAILTYPE_LABEL_MONO,
/* alternate labels */
RailTypeLabelList(),
@@ -421,7 +421,7 @@ static const RailTypeInfo _original_railtypes[] = {
0,
/* rail type label */
'MGLV',
RAILTYPE_LABEL_MAGLEV,
/* alternate labels */
RailTypeLabelList(),

4
src/table/roadtypes.h
View File

@@ -79,7 +79,7 @@ static const RoadTypeInfo _original_roadtypes[] = {
0,
/* road type label */
'ROAD',
ROADTYPE_LABEL_ROAD,
/* alternate labels */
RoadTypeLabelList(),
@@ -165,7 +165,7 @@ static const RoadTypeInfo _original_roadtypes[] = {
0,
/* road type label */
'ELRL',
ROADTYPE_LABEL_TRAM,
/* alternate labels */
RoadTypeLabelList(),