diff options
| -rw-r--r-- | openttd-git/PKGBUILD | 6 | ||||
| -rw-r--r-- | openttd-git/signaltunnel.patch | 10 | ||||
| -rw-r--r-- | openttd-git/underground.patch | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD index a3b283623..353a14ec3 100644 --- a/openttd-git/PKGBUILD +++ b/openttd-git/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Erich Eckner <arch at eckner dot net> pkgname=openttd-git -pkgver=31178.f656b0ae9 +pkgver=31179.7469f00c5 _commit=${pkgver#*.} pkgrel=1 pkgdesc="A FOSS clone of Transport Tycoon Deluxe." @@ -51,9 +51,9 @@ source=( 'opntitle.dat' ) sha512sums=('SKIP' - '8034815acaeec9fa63ed8da1657a7a39a740905a72137da0b239e7af9bc027c686e0c29916db07c816a40ebf3b0fb69049d9e4af43372058ed6618840a5c7372' + '44116f82ced3ef8e121e07d517190bbc8db74345d8553176673f24c949fbab542c394d3e15923e00144a1b5ca55cd78c787ac8e95f47635640feb2042c10cb53' 'fb3b39cf651074597a0301e32fa04f57efd34580c2f647a7bff1e2c5fb33c03aaedb602f762e9df27531a26ec1752ab678bf79df8166325b4298b70335a05bfb' - 'cdcb384755ee1b122d4de3e05618239143ba515688f113314ce6ac55719a103a7dbdfae504c6b03c60192e162cbca2a91db9554e41c1d4ce20e1e547a4143316' + 'a41523f9af9973d74d97c2a04987c8a374b79bc8b4bb6a7a8ad7aca2e2c9d7c69788d8e3771b4003340940b074c343a36c31bd0100c23b9f6e2434ed1151b81a' 'a3fd5b230b7cdd67a1b6607887433c0cb85ba1dfd30cedfddf573a58b23ccce7c470a22cf7f65a29c173bba12976c5889482cef24f49c8c0a829883a71bcd87d') pkgver() { diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index 9f5d6aa4e..0cab6a408 100644 --- a/openttd-git/signaltunnel.patch +++ b/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/openttd-git/underground.patch b/openttd-git/underground.patch index e25a6d8cf..431b20b90 100644 --- a/openttd-git/underground.patch +++ b/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 |