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

Merge pull request #281 from VacuumBreather/train_speed_adaptation

Browse Source 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
This commit is contained in:
Jonathan G Rennison
2021-07-03 23:00:25 +01:00
parent b23ba0c6c0 9edc13b889
commit 158608442c
22 changed files with 272 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/table/newgrf_debug_data.h
View File

@@ -162,8 +162,11 @@ class NIHVehicle : public NIHelper {
seprintf(buffer, lastof(buffer), " T cache: veh weight: %u, user data: %u, curve speed: %u",
t->tcache.cached_veh_weight, t->tcache.user_def_data, t->tcache.cached_max_curve_speed);
print(buffer);
seprintf(buffer, lastof(buffer), " Wait counter: %u, rev distance: %u, TBSN: %u, speed restriction: %u",
t->wait_counter, t->reverse_distance, t->tunnel_bridge_signal_num, t->speed_restriction);
seprintf(buffer, lastof(buffer), " Wait counter: %u, rev distance: %u, TBSN: %u",
t->wait_counter, t->reverse_distance, t->tunnel_bridge_signal_num);
print(buffer);
seprintf(buffer, lastof(buffer), " Speed restriction: %u, signal speed restriction (ATC): %u",
t->speed_restriction, t->signal_speed_restriction);
print(buffer);
seprintf(buffer, lastof(buffer), " Railtype: %u, compatible_railtypes: 0x" OTTD_PRINTFHEX64,
t->railtype, t->compatible_railtypes);

16
src/table/settings.ini
View File

@@ -64,6 +64,7 @@ static bool ClimateThresholdModeChanged(int32 p1);
static bool VelocityUnitsChanged(int32 p1);
static bool ChangeTrackTypeSortMode(int32 p1);
static bool PublicRoadsSettingChange(int32 p1);
static bool TrainSpeedAdaptationChanged(int32 p1);
static bool UpdateClientName(int32 p1);
static bool UpdateServerPassword(int32 p1);
@@ -1675,10 +1676,19 @@ strhelp = STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES_HELPTEXT
cat = SC_BASIC
patxname = ""slow_road_vehicles_in_curves.vehicle.slow_road_vehicles_in_curves""
;; vehicle.train_speed_adaption
[SDT_NULL]
length = 1
[SDT_XREF]
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
xref = ""vehicle.train_speed_adaptation""
[SDT_BOOL]
base = GameSettings
var = vehicle.train_speed_adaptation
def = false
str = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION
strhelp = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION_HELPTEXT
cat = SC_EXPERT
proc = TrainSpeedAdaptationChanged
patxname = ""train_speed_adaptation.vehicle.train_speed_adaptation""
[SDT_BOOL]
base = GameSettings