diff options
| author | rubidium <rubidium@openttd.org> | 2010-12-13 21:53:23 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-12-13 21:53:23 +0000 |
| commit | e3b391249d2607e5d2af60ada11d3bbaeba0b3a1 (patch) | |
| tree | 1e722f461b991b352dff31fcc4f457b65f70d544 /src | |
| parent | 49a77e89c425c37eb4c6bb4bf9e942bd75a48d57 (diff) | |
| download | openttd-e3b391249d2607e5d2af60ada11d3bbaeba0b3a1.tar.xz | |
(svn r21505) -Change: generalise the lost_train_warning setting to lost_vehicle_warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/settings_gui.cpp | 2 | ||||
| -rw-r--r-- | src/settings_type.h | 2 | ||||
| -rw-r--r-- | src/table/settings.h | 2 | ||||
| -rw-r--r-- | src/train_cmd.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 069766520..75be0a9a7 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1456,7 +1456,6 @@ static SettingEntry _settings_vehicles_trains[] = { SettingEntry("vehicle.train_acceleration_model"), SettingEntry("vehicle.train_slope_steepness"), SettingEntry("vehicle.mammoth_trains"), - SettingEntry("gui.lost_train_warn"), SettingEntry("vehicle.wagon_speed_limits"), SettingEntry("vehicle.disable_elrails"), SettingEntry("vehicle.freight_trains"), @@ -1474,6 +1473,7 @@ static SettingEntry _settings_vehicles[] = { SettingEntry("gui.new_nonstop"), SettingEntry("gui.order_review_system"), SettingEntry("gui.vehicle_income_warn"), + SettingEntry("gui.lost_vehicle_warn"), SettingEntry("vehicle.never_expire_vehicles"), SettingEntry("vehicle.max_trains"), SettingEntry("vehicle.max_roadveh"), diff --git a/src/settings_type.h b/src/settings_type.h index bf6a926ed..9fc02a43a 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -43,7 +43,7 @@ struct DifficultySettings { struct GUISettings { bool vehicle_speed; ///< show vehicle speed bool sg_full_load_any; ///< new full load calculation, any cargo must be full read from pre v93 savegames - bool lost_train_warn; ///< if a train can't find its destination, show a warning + bool lost_vehicle_warn; ///< if a vehicle can't find its destination, show a warning uint8 order_review_system; ///< perform order reviews on vehicles bool vehicle_income_warn; ///< if a vehicle isn't generating income, show a warning bool status_long_date; ///< always show long date in status bar diff --git a/src/table/settings.h b/src/table/settings.h index c21192c01..2cf8c04f1 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -593,7 +593,7 @@ const SettingDesc _settings[] = { SDTC_VAR(gui.semaphore_build_before, SLE_INT32, S, NC, 1950, MIN_YEAR, MAX_YEAR, 1, STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE, ResetSignalVariant), SDTC_BOOL(gui.vehicle_income_warn, S, 0, true, STR_CONFIG_SETTING_WARN_INCOME_LESS, NULL), SDTC_VAR(gui.order_review_system, SLE_UINT8, S, MS, 2, 0, 2, 0, STR_CONFIG_SETTING_ORDER_REVIEW, NULL), - SDTC_BOOL(gui.lost_train_warn, S, 0, true, STR_CONFIG_SETTING_WARN_LOST_TRAIN, NULL), + SDTC_BOOL(gui.lost_vehicle_warn, S, 0, true, STR_CONFIG_SETTING_WARN_LOST_TRAIN, NULL), SDTC_BOOL(gui.always_build_infrastructure, S, 0, false, STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE, RedrawScreen), SDTC_BOOL(gui.new_nonstop, S, 0, false, STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT, NULL), SDTC_VAR(gui.stop_location, SLE_UINT8, S, MS, 2, 0, 2, 1, STR_CONFIG_SETTING_STOP_LOCATION, NULL), diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 0d42cb47d..02820faa7 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2417,7 +2417,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, SetBit(v->vehicle_flags, VF_PATHFINDER_LOST); /* and notify user about the event */ AI::NewEvent(v->owner, new AIEventVehicleLost(v->index)); - if (_settings_client.gui.lost_train_warn && v->owner == _local_company) { + if (_settings_client.gui.lost_vehicle_warn && v->owner == _local_company) { SetDParam(0, v->index); AddVehicleNewsItem( STR_NEWS_TRAIN_IS_LOST, @@ -3609,7 +3609,7 @@ static bool TrainLocoHandler(Train *v, bool mode) if (HasBit(v->flags, VRF_TRAIN_STUCK) && v->wait_counter > 2 * _settings_game.pf.wait_for_pbs_path * DAY_TICKS) { /* Show message to player. */ - if (_settings_client.gui.lost_train_warn && v->owner == _local_company) { + if (_settings_client.gui.lost_vehicle_warn && v->owner == _local_company) { SetDParam(0, v->index); AddVehicleNewsItem( STR_NEWS_TRAIN_IS_STUCK, |