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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	cmake/SourceList.cmake
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_base.h
#	src/elrail.cpp
#	src/network/core/udp.cpp
#	src/network/network_admin.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_storage.h
#	src/os/unix/crashlog_unix.cpp
#	src/rail.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/road_map.h
#	src/saveload/labelmaps_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/settings/world_settings.ini
#	src/tests/test_script_admin.cpp
#	src/textfile_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2023-11-19 12:19:17 +00:00
parent 625ecbe58c 30eba33f1e
commit c929f7075e
230 changed files with 2458 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/table/newgrf_debug_data.h
View File

@@ -85,7 +85,7 @@ static void DumpRailTypeList(NIExtraInfoOutput &output, const char *prefix, Rail
char buffer[256];
for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) {
if (!HasBit(rail_types, rt)) continue;
const RailtypeInfo *rti = GetRailTypeInfo(rt);
const RailTypeInfo *rti = GetRailTypeInfo(rt);
if (rti->label == 0) continue;
seprintf(buffer, lastof(buffer), "%s%02u %s%s",
@@ -595,7 +595,7 @@ class NIHVehicle : public NIHelper {
}
if (e->type == VEH_TRAIN) {
const RailtypeInfo *rti = GetRailTypeInfo(e->u.rail.railtype);
const RailTypeInfo *rti = GetRailTypeInfo(e->u.rail.railtype);
seprintf(buffer, lastof(buffer), " Railtype: %u (%s), Compatible: 0x" OTTD_PRINTFHEX64 ", Powered: 0x" OTTD_PRINTFHEX64 ", All compatible: 0x" OTTD_PRINTFHEX64,
e->u.rail.railtype, dumper().RailTypeLabel(e->u.rail.railtype), rti->compatible_railtypes, rti->powered_railtypes, rti->all_compatible_railtypes);
output.print(buffer);
@@ -1617,7 +1617,7 @@ class NIHRailType : public NIHelper {
RailType secondary = GetTileSecondaryRailTypeIfValid(index);
auto writeRailType = [&](RailType type) {
const RailtypeInfo *info = GetRailTypeInfo(type);
const RailTypeInfo *info = GetRailTypeInfo(type);
seprintf(buffer, lastof(buffer), " Type: %u (%s)", type, dumper().RailTypeLabel(type));
output.print(buffer);
seprintf(buffer, lastof(buffer), " Flags: %c%c%c%c%c%c",

2
src/table/railtypes.h
View File

@@ -16,7 +16,7 @@
/**
* Global Railtype definition
*/
static const RailtypeInfo _original_railtypes[] = {
static const RailTypeInfo _original_railtypes[] = {
/** Railway */
{ // Main Sprites
{ SPR_RAIL_TRACK_Y, SPR_RAIL_TRACK_N_S, SPR_RAIL_TRACK_BASE, SPR_RAIL_SINGLE_X, SPR_RAIL_SINGLE_Y,

7
src/table/settings/world_settings.ini
View File

@@ -756,6 +756,13 @@ str = STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD
strhelp = STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT
cat = SC_BASIC
[SDT_BOOL]
var = construction.crossing_with_competitor
def = true
str = STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR
strhelp = STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR_HELPTEXT
cat = SC_BASIC
[SDT_BOOL]
var = construction.road_custom_bridge_heads
flags = SF_PATCH