openttd-git: 31178.f656b0ae9 -> 31179.7469f00c5

5 files changed, 21 insertions, 21 deletions

diff --git a/manualPorts/openttd-git/.md5sum b/manualPorts/openttd-git/.md5sum
index f9dfbf3..92c9b42 100644
--- a/manualPorts/openttd-git/.md5sum
+++ b/manualPorts/openttd-git/.md5sum
@@ -1,8 +1,8 @@
-6901c9136cd55aba806181301ac01aa7  f656b0ae9.tar.gz
+4bfe7aa5a4f42c2299eb7191a2d5d7e4  7469f00c5.tar.gz
 4f4a6465cd5b84964b7ceecd1c06d686  opengfx-0.5.4.zip
 858b79d44aea6de5e15d9d1439e86cc3  openmsx-0.3.1.zip
 6e3a5cf97fe69e3a351c3e0615a14b04  opensfx-0.2.3.zip
 00fd6afd1ab1bfbd8d775175a42c3899  opntitle.dat
-643622033e0bb43b603f558f242860db  signaltunnel.patch
+df9c463ac8befba5ba505e928190e28e  signaltunnel.patch
 8f2d0bcc3e69f469652a9495dbebb943  sloped-stations.patch
-01a550db4cf8f68ae3c8c3f6337bc5a6  underground.patch
+1d6970041593c23e491b9d5d0ba0ff20  underground.patch
diff --git a/manualPorts/openttd-git/.signature b/manualPorts/openttd-git/.signature
index 640b43b..e75735c 100644
--- a/manualPorts/openttd-git/.signature
+++ b/manualPorts/openttd-git/.signature
@@ -1,12 +1,12 @@
 untrusted comment: verify with /etc/ports/deepthought.pub
-RWQxCptPusLGGtis6dEOG4qzXAQ4RF3aIyBoabwRoFFhP29Z9LPRDMUpkGWbaEUL31AeKC0SLxfEQesLwzkOA/VuMQiacCQjDQI=
-SHA256 (Pkgfile) = 93470919304b3f5f14fc40c32a4da6e26158efb260cc6a64e800afb20d4c9e4f
+RWQxCptPusLGGp5CA2HDTl3fUag9Q/pfWqTjzYaRIvuIk3kzfKLkutCgonNA4zhCrDVt34NWfilV6rgDgJ/HV5TZKD4Sh8GrjAE=
+SHA256 (Pkgfile) = 020adc9a309d5eb43048cd4c44015d80b9edd39aeec8ecfa69ed216ac9d3b815
 SHA256 (.footprint) = 2950465990b1e14b5c788bae2b920401e880c096349c23e7ed584814f43c0192
 SHA256 (opengfx-0.5.4.zip) = 3d136d776906dbe8b5df1434cb9a68d1249511a3c4cfaca55cc24cc0028ae078
 SHA256 (opensfx-0.2.3.zip) = 3574745ac0c138bae53b56972591db8d778ad9faffd51deae37a48a563e71662
 SHA256 (openmsx-0.3.1.zip) = 92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5
-SHA256 (signaltunnel.patch) = eea1920124b9242312e411d1721373efd222eefaabd3f17bb9ad3f033770c06f
+SHA256 (signaltunnel.patch) = 9c6ad812b588aaabef22ceaaea4e3ad83c25960feafe9fc6ef00835f9354290a
 SHA256 (sloped-stations.patch) = 6972ee530d6e545fbdf4f4fd6e0921183e90af732f94edc8a81a8e3fa1c10bf7
-SHA256 (underground.patch) = db763a97c67ec3c08b4a177779f8270e6b4ffdd2026d98521fe6ca0c4a7f26e5
+SHA256 (underground.patch) = 96ef1ff7da125c5f872c57a8ff2313fd7346ae3ae900923e2a1990789e938d31
 SHA256 (opntitle.dat) = f4931200a68a6f592716ec2dce468530670484dd357ab52c3a2272b9db3dfd95
-SHA256 (f656b0ae9.tar.gz) = 544d85c210516004e5d3b8755b41ec1ed2b01e5a330d354ffccb6c10c05478d1
+SHA256 (7469f00c5.tar.gz) = b86981ab97f531318d6816a4f81df25af344494627434589b054c552632209f9
diff --git a/manualPorts/openttd-git/Pkgfile b/manualPorts/openttd-git/Pkgfile
index ffc52da..3ba3c45 100644
--- a/manualPorts/openttd-git/Pkgfile
+++ b/manualPorts/openttd-git/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libsdl libpng fontconfig lzo
 
 name=openttd-git
-version=31178.f656b0ae9
+version=31179.7469f00c5
 
 gfxversion=0.5.4
 sfxversion=0.2.3
diff --git a/manualPorts/openttd-git/signaltunnel.patch b/manualPorts/openttd-git/signaltunnel.patch
index 9f5d6aa..0cab6a4 100644
--- a/manualPorts/openttd-git/signaltunnel.patch
+++ b/manualPorts/openttd-git/signaltunnel.patch
@@ -1,5 +1,5 @@
 diff --git a/src/lang/english.txt b/src/lang/english.txt
-index d76f9caee..6b582ac49 100644
+index b6578ac8d..52d242cd2 100644
 --- a/src/lang/english.txt
 +++ b/src/lang/english.txt
 @@ -1805,6 +1805,9 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT                :Set the minimum
@@ -12,7 +12,7 @@ index d76f9caee..6b582ac49 100644
  STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :When dragging, place signals every: {STRING2}
  STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT                :Set the distance at which signals will be built on a track up to the next obstacle (signal, junction), if signals are dragged
  STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE                   :{COMMA} tile{P 0 "" s}
-@@ -2999,8 +3002,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Ship depot
+@@ -2994,8 +2997,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Ship depot
  # Industries come directly from their industry names
  
  STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Railway tunnel
@@ -261,7 +261,7 @@ index 59c1d27ab..ee7d0423d 100644
  
  /**
 diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
-index 04deb93eb..af3276608 100644
+index ae894cd50..c190bc29d 100644
 --- a/src/settings_gui.cpp
 +++ b/src/settings_gui.cpp
 @@ -1622,6 +1622,7 @@ static SettingsContainer &GetSettingsTree()
@@ -269,11 +269,11 @@ index 04deb93eb..af3276608 100644
  			{
  				construction->Add(new SettingEntry("gui.link_terraform_toolbar"));
 +				construction->Add(new SettingEntry("construction.simulated_wormhole_signals"));
- 				construction->Add(new SettingEntry("gui.enable_signal_gui"));
  				construction->Add(new SettingEntry("gui.persistent_buildingtools"));
  				construction->Add(new SettingEntry("gui.quick_goto"));
+ 				construction->Add(new SettingEntry("gui.default_rail_type"));
 diff --git a/src/settings_type.h b/src/settings_type.h
-index dd49d3982..dc90ced1c 100644
+index 3c2f2be7b..de1e85825 100644
 --- a/src/settings_type.h
 +++ b/src/settings_type.h
 @@ -344,6 +344,7 @@ struct ConstructionSettings {
diff --git a/manualPorts/openttd-git/underground.patch b/manualPorts/openttd-git/underground.patch
index e25a6d8..431b20b 100644
--- a/manualPorts/openttd-git/underground.patch
+++ b/manualPorts/openttd-git/underground.patch
@@ -692,7 +692,7 @@ index 4e3eb3228..9feb9ba4c 100644
  STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stationsklasse: {LTBLUE}{STRING}
  STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stationstype: {LTBLUE}{STRING}
 diff --git a/src/lang/english.txt b/src/lang/english.txt
-index d76f9caee..adfe9c588 100644
+index b6578ac8d..e790a3185 100644
 --- a/src/lang/english.txt
 +++ b/src/lang/english.txt
 @@ -473,6 +473,19 @@ STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Airport constru
@@ -715,7 +715,7 @@ index d76f9caee..adfe9c588 100644
  
  # Music menu
  ###length 1
-@@ -2916,7 +2929,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Tramway
+@@ -2911,7 +2924,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Tramway
  STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Railway owner: {LTBLUE}{STRING1}
  STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Local authority: {LTBLUE}{STRING1}
  STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :None
@@ -724,7 +724,7 @@ index d76f9caee..adfe9c588 100644
  STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Built: {LTBLUE}{DATE_LONG}
  STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Station class: {LTBLUE}{STRING}
  STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Station type: {LTBLUE}{STRING}
-@@ -5545,3 +5558,35 @@ STR_PLANE                                                       :{BLACK}{PLANE}
+@@ -5540,3 +5553,35 @@ STR_PLANE                                                       :{BLACK}{PLANE}
  STR_SHIP                                                        :{BLACK}{SHIP}
  
  STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
@@ -2159,7 +2159,7 @@ index a1dbb6567..b0c3656dc 100644
  #include "../../widgets/viewport_widget.h"
  #include "../../widgets/waypoint_widget.h"
 diff --git a/src/settings_table.cpp b/src/settings_table.cpp
-index 27fb4ef08..03a90e8bd 100644
+index 4b94a8be7..bf6493391 100644
 --- a/src/settings_table.cpp
 +++ b/src/settings_table.cpp
 @@ -17,6 +17,7 @@
@@ -2171,7 +2171,7 @@ index 27fb4ef08..03a90e8bd 100644
  #include "train.h"
  #include "news_func.h"
 diff --git a/src/settings_type.h b/src/settings_type.h
-index dd49d3982..408ad79c2 100644
+index 3c2f2be7b..b30fcb07b 100644
 --- a/src/settings_type.h
 +++ b/src/settings_type.h
 @@ -171,6 +171,8 @@ struct GUISettings {
@@ -2572,10 +2572,10 @@ index d51fbbf02..7aea638d2 100644
 +min      = MIN_LAYER_COUNT_BITS
 +max      = MAX_LAYER_COUNT_BITS
 diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini
-index f08c84981..5b0dc123e 100644
+index 277586f91..4c7916197 100644
 --- a/src/table/settings/gui_settings.ini
 +++ b/src/table/settings/gui_settings.ini
-@@ -857,3 +857,11 @@ min      = 1
+@@ -848,3 +848,11 @@ min      = 1
  max      = 65535
  cat      = SC_EXPERT