summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2011-04-19 18:47:36 +0000
committersmatz <smatz@openttd.org>2011-04-19 18:47:36 +0000
commitc3f1fd571656c5439cc064d1e677e54e9c205684 (patch)
tree15f80fd3a257c2ba665ffdce6b43ae2c3ac155d7 /src
parent9eafc6c28fd806fe81214e8e96de17a26d824698 (diff)
downloadopenttd-c3f1fd571656c5439cc064d1e677e54e9c205684.tar.xz
(svn r22352) -Change: make YAPF the default pathfinder for ships, don't discourage players from using it
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt4
-rw-r--r--src/table/settings.ini4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index b31bfae3b..630868621 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1340,15 +1340,13 @@ STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Trains
STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Towns
STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Industries
+STR_CONFIG_SETTING_PATHFINDER_OPF :Original
STR_CONFIG_SETTING_PATHFINDER_NPF :NPF
STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED :YAPF {BLUE}(Recommended)
STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder for trains: {ORANGE}{STRING1}
STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :{LTBLUE}Pathfinder for road vehicles: {ORANGE}{STRING1}
STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :{LTBLUE}Pathfinder for ships: {ORANGE}{STRING1}
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(Recommended)
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_NPF :NPF
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(Not recommended)
STR_CONFIG_SETTING_REVERSE_AT_SIGNALS :{LTBLUE}Automatic reversing at signals: {ORANGE}{STRING1}
STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Change setting value
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 36db523d6..b5ea7293b 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -674,12 +674,12 @@ var = pf.pathfinder_for_ships
type = SLE_UINT8
from = 87
guiflags = SGF_MULTISTRING
-def = 0
+def = 2
min = 0
max = 2
interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS
-strval = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF
+strval = STR_CONFIG_SETTING_PATHFINDER_OPF
[SDT_BOOL]
base = GameSettings