diff options
| author | rubidium <rubidium@openttd.org> | 2011-02-04 15:29:50 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-02-04 15:29:50 +0000 |
| commit | 4355231f677b2ad779daaab701444c5b003cdaed (patch) | |
| tree | f1e56a46ce1658ea03125942a87fd51ab11cb51d | |
| parent | 4c5ca174861c4324761b31de5a98a5c9a7d976df (diff) | |
| download | openttd-4355231f677b2ad779daaab701444c5b003cdaed.tar.xz | |
(svn r21958) -Cleanup: join_stations setting; can done by distant join and could be subverted by distant join
| -rw-r--r-- | src/lang/english.txt | 1 | ||||
| -rw-r--r-- | src/settings_gui.cpp | 1 | ||||
| -rw-r--r-- | src/settings_type.h | 1 | ||||
| -rw-r--r-- | src/station_cmd.cpp | 3 | ||||
| -rw-r--r-- | src/table/settings.h | 2 |
5 files changed, 1 insertions, 7 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt index cc2d8d76a..4aa37d747 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1108,7 +1108,6 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realistic STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for trains {ORANGE}{STRING1}% STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for road vehicles {ORANGE}{STRING1}% STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Forbid trains and ships from making 90° turns: {ORANGE}{STRING1} -STR_CONFIG_SETTING_JOINSTATIONS :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING1} STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Allow to join stations not directly adjacent: {ORANGE}{STRING1} STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1} STR_CONFIG_SETTING_GRADUAL_LOADING :{LTBLUE}Load vehicles gradually: {ORANGE}{STRING1} diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 15f285715..aafefc2c9 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1353,7 +1353,6 @@ static SettingsPage _settings_stations_cargo_page = {_settings_stations_cargo, l static SettingEntry _settings_stations[] = { SettingEntry(&_settings_stations_cargo_page, STR_CONFIG_SETTING_STATIONS_CARGOHANDLING), - SettingEntry("station.join_stations"), SettingEntry("station.adjacent_stations"), SettingEntry("station.distant_join_stations"), SettingEntry("station.station_spread"), diff --git a/src/settings_type.h b/src/settings_type.h index 450a8849f..7629d83a4 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -382,7 +382,6 @@ struct EconomySettings { /** Settings related to stations. */ struct StationSettings { bool modified_catchment; ///< different-size catchment areas - bool join_stations; ///< allow joining of train stations bool adjacent_stations; ///< allow stations to be built directly adjacent to other stations bool distant_join_stations; ///< allow to join non-adjacent stations bool never_expire_airports; ///< never expire airports diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 5997bb4d4..6f7e6450a 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1150,9 +1150,6 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32 if (st->owner != _current_company) return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION); if (st->train_station.tile != INVALID_TILE) { - /* check if we want to expanding an already existing station? */ - if (!_settings_game.station.join_stations) return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD); - CommandCost ret = CanExpandRailStation(st, new_location, axis); if (ret.Failed()) return ret; } diff --git a/src/table/settings.h b/src/table/settings.h index 7d0e4d461..594082f4a 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -424,7 +424,7 @@ const SettingDesc _settings[] = { SDT_CONDBOOL(GameSettings, vehicle.dynamic_engines, 95, SL_MAX_VERSION, 0,NN, true, STR_CONFIG_SETTING_DYNAMIC_ENGINES, ChangeDynamicEngines), SDT_CONDVAR(GameSettings, vehicle.plane_crashes, SLE_UINT8,138, SL_MAX_VERSION, 0,MS, 2, 0, 2, 1, STR_CONFIG_SETTING_PLANE_CRASHES, NULL), - SDT_BOOL(GameSettings, station.join_stations, 0, 0, true, STR_CONFIG_SETTING_JOINSTATIONS, NULL), + SDT_CONDNULL( 1, 0, 158), // station.join_stations SDTC_CONDBOOL( gui.sg_full_load_any, 22, 92, 0, 0, true, STR_NULL, NULL), SDT_BOOL(GameSettings, order.improved_load, 0,NN, true, STR_CONFIG_SETTING_IMPROVEDLOAD, NULL), SDT_BOOL(GameSettings, order.selectgoods, 0, 0, true, STR_CONFIG_SETTING_SELECTGOODS, NULL), |