summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-12-07 21:08:08 +0000
committerrubidium <rubidium@openttd.org>2010-12-07 21:08:08 +0000
commitdf410fd7ed6a4ad36d59f4eb9c84138437cb8a0c (patch)
tree6247fa60709b3e184851a2de0fc9038a41172d8b /src
parentb3eb3b96b9928069583cf2ade0ab09a26d93db85 (diff)
downloadopenttd-df410fd7ed6a4ad36d59f4eb9c84138437cb8a0c.tar.xz
(svn r21426) -Change: introduce a setting for the types of commands that are allowed to be executed while paused
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt5
-rw-r--r--src/saveload/saveload.cpp3
-rw-r--r--src/settings_gui.cpp1
-rw-r--r--src/settings_type.h1
-rw-r--r--src/table/settings.h1
5 files changed, 10 insertions, 1 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 12feae3d7..d5a23bde4 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1216,6 +1216,11 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :short (31-12-20
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ISO (2008-12-31)
STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :{LTBLUE}Automatically pause when starting a new game: {ORANGE}{STRING1}
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :{LTBLUE}When paused allow: {ORANGE}{STRING1}
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :no actions
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :all non-construction actions
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING :all but landscape modifying actions
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS :all actions
STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :{LTBLUE}Use the advanced vehicle list: {ORANGE}{STRING1}
STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF :Off
STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OWN :Own company
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index d196dd3fd..9c0926200 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -218,8 +218,9 @@
* 151 20918
* 152 21171
* 153 21263
+ * 154 21426
*/
-extern const uint16 SAVEGAME_VERSION = 153; ///< Current savegame version of OpenTTD.
+extern const uint16 SAVEGAME_VERSION = 154; ///< Current savegame version of OpenTTD.
SavegameType _savegame_type; ///< type of savegame we are loading
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index c0f75b9c5..f48411e02 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1324,6 +1324,7 @@ static SettingEntry _settings_construction[] = {
SettingEntry("station.never_expire_airports"),
SettingEntry("construction.freeform_edges"),
SettingEntry("construction.extra_tree_placement"),
+ SettingEntry("construction.command_pause_level"),
};
/** Construction sub-page */
static SettingsPage _settings_construction_page = {_settings_construction, lengthof(_settings_construction)};
diff --git a/src/settings_type.h b/src/settings_type.h
index 3550c2ad9..bf6a926ed 100644
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -211,6 +211,7 @@ struct ConstructionSettings {
uint8 industry_platform; ///< the amount of flat land around an industry
bool freeform_edges; ///< allow terraforming the tiles at the map edges
uint8 extra_tree_placement; ///< (dis)allow building extra trees in-game
+ uint8 command_pause_level; ///< level/amount of commands that can't be executed while paused
};
/** Settings related to the AI. */
diff --git a/src/table/settings.h b/src/table/settings.h
index 376ec6284..c21192c01 100644
--- a/src/table/settings.h
+++ b/src/table/settings.h
@@ -371,6 +371,7 @@ const SettingDesc _settings[] = {
SDT_CONDOMANY(GameSettings, vehicle.road_side, SLE_UINT8, 97, SL_MAX_VERSION, 0,NN, 1, 1, _roadsides, STR_NULL, CheckRoadSide, NULL),
SDT_BOOL(GameSettings, construction.build_on_slopes, 0,NN, true, STR_CONFIG_SETTING_BUILDONSLOPES, NULL),
+ SDT_CONDVAR(GameSettings, construction.command_pause_level, SLE_UINT8,154, SL_MAX_VERSION, 0,MS|NN, 1, 0, 3, 1, STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL, NULL),
SDT_CONDBOOL(GameSettings, construction.autoslope, 75, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_AUTOSLOPE, NULL),
SDT_BOOL(GameSettings, construction.extra_dynamite, 0, 0, true, STR_CONFIG_SETTING_EXTRADYNAMITE, NULL),
SDT_BOOL(GameSettings, construction.longbridges, 0,NN, true, STR_CONFIG_SETTING_LONGBRIDGES, NULL),