diff options
| author | rubidium <rubidium@openttd.org> | 2011-02-06 21:31:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-02-06 21:31:33 +0000 |
| commit | cebe8ab630e0d03fdcbdf436e5324fb12c779072 (patch) | |
| tree | c2f058643d94655dbf4008f27d04074edf91f9ce | |
| parent | 4af28a3867e72d4386cd6ea063ea4336719bb159 (diff) | |
| download | openttd-cebe8ab630e0d03fdcbdf436e5324fb12c779072.tar.xz | |
(svn r22004) -Change [FS#4471]: always report mammoth trains are disabled to NewGRFs, and allow the maximum train length to be modified in multiplayer as well
| -rw-r--r-- | src/newgrf.cpp | 2 | ||||
| -rw-r--r-- | src/table/settings.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 21df87951..469fefb56 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -6912,7 +6912,7 @@ static void InitializeGRFSpecial() | (1 << 0x1E); // generalfixes _ttdpatch_flags[1] = ((_settings_game.economy.station_noise_level ? 1 : 0) << 0x07) // moreairports - based on units of noise - | ((_settings_game.vehicle.max_train_length > 5 ? 1 : 0) << 0x08) // mammothtrains + | (1 << 0x08) // mammothtrains | (1 << 0x09) // trainrefit | (0 << 0x0B) // subsidiaries | ((_settings_game.order.gradual_loading ? 1 : 0) << 0x0C) // gradualloading diff --git a/src/table/settings.h b/src/table/settings.h index 95f7693fc..e9597ca57 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -394,7 +394,7 @@ const SettingDesc _settings[] = { SDT_CONDVAR(GameSettings, vehicle.train_slope_steepness, SLE_UINT8,133, SL_MAX_VERSION, 0, 0, 3, 0, 10, 1, STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS, TrainSlopeSteepnessChanged), SDT_CONDVAR(GameSettings, vehicle.roadveh_slope_steepness, SLE_UINT8,139, SL_MAX_VERSION, 0, 0, 7, 0, 10, 1, STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS, RoadVehSlopeSteepnessChanged), SDT_BOOL(GameSettings, pf.forbid_90_deg, 0, 0, false, STR_CONFIG_SETTING_FORBID_90_DEG, NULL), - SDT_CONDVAR(GameSettings, vehicle.max_train_length, SLE_UINT8,159, SL_MAX_VERSION, 0,NN, 7, 1, 64, 1, STR_CONFIG_SETTING_TRAIN_LENGTH, NULL), + SDT_CONDVAR(GameSettings, vehicle.max_train_length, SLE_UINT8,159, SL_MAX_VERSION, 0, 0, 7, 1, 64, 1, STR_CONFIG_SETTING_TRAIN_LENGTH, NULL), SDT_CONDNULL( 1, 0, 158), // vehicle.mammoth_trains SDT_CONDVAR(GameSettings, vehicle.smoke_amount, SLE_UINT8,145, SL_MAX_VERSION, 0,MS, 1, 0, 2, 0, STR_CONFIG_SETTING_SMOKE_AMOUNT, NULL), SDT_CONDNULL( 1, 0, 158), // order.gotodepot |