openttd-git: -> 28128.2b662b448c

5 files changed, 113 insertions, 107 deletions

diff --git a/manualPorts/openttd-git/.footprint b/manualPorts/openttd-git/.footprint
index e1251b4..a879ef7 100644
--- a/manualPorts/openttd-git/.footprint
+++ b/manualPorts/openttd-git/.footprint
@@ -48,9 +48,11 @@ drwxr-xr-x	root/root	usr/share/openttd/baseset/
 -rw-r--r--	root/root	usr/share/openttd/baseset/openttd.grf
 -rw-r--r--	root/root	usr/share/openttd/baseset/opntitle.dat
 -rw-r--r--	root/root	usr/share/openttd/baseset/orig_dos.obg
+-rw-r--r--	root/root	usr/share/openttd/baseset/orig_dos.obm
 -rw-r--r--	root/root	usr/share/openttd/baseset/orig_dos.obs
 -rw-r--r--	root/root	usr/share/openttd/baseset/orig_dos_de.obg
 -rw-r--r--	root/root	usr/share/openttd/baseset/orig_extra.grf
+-rw-r--r--	root/root	usr/share/openttd/baseset/orig_tto.obm
 -rw-r--r--	root/root	usr/share/openttd/baseset/orig_win.obg
 -rw-r--r--	root/root	usr/share/openttd/baseset/orig_win.obm
 -rw-r--r--	root/root	usr/share/openttd/baseset/orig_win.obs
diff --git a/manualPorts/openttd-git/.md5sum b/manualPorts/openttd-git/.md5sum
index b847ee2..1271834 100644
--- a/manualPorts/openttd-git/.md5sum
+++ b/manualPorts/openttd-git/.md5sum
@@ -1,6 +1,6 @@
-0498d776f1c6ac06da2502e6d9f40866  2406500140.tar.gz
+9bb9ee9a3d4d3f62fa6b6a814d888052  2b662b448c.tar.gz
 47a15ba014973e0f1c969b9cbd25844a  clipboard.grf
-a2d67a7da4488d83c3add004ac328f94  everything.patch
+153d6758074296d3f0c376127e4cb0a4  everything.patch
 4f4a6465cd5b84964b7ceecd1c06d686  opengfx-0.5.4.zip
 858b79d44aea6de5e15d9d1439e86cc3  openmsx-0.3.1.zip
 6e3a5cf97fe69e3a351c3e0615a14b04  opensfx-0.2.3.zip
diff --git a/manualPorts/openttd-git/.signature b/manualPorts/openttd-git/.signature
index ac5442d..678a1a5 100644
--- a/manualPorts/openttd-git/.signature
+++ b/manualPorts/openttd-git/.signature
@@ -1,10 +1,10 @@
 untrusted comment: verify with /etc/ports/deepthought.pub
-RWQxCptPusLGGnKWDycyrmqe+VTo3XQcbvqIi+aT77hoWz3YoDQ1bWf/uMYT1OfGEZhfF+qGYedadqvCO8rgRJ9w/N1HOIOSAAo=
-SHA256 (Pkgfile) = 65a5541359761f18b60f5a57cb0ccecea49e0c68f05a9a1b1937bc81571b7bcc
-SHA256 (.footprint) = 7fcaa73ef754a08dd0fe7208f9887333f0b9d24315a63d1eb89646bfee3c97ed
+RWQxCptPusLGGoUOKppAtCaWRYZafxYkhLWrDQ+LNYRitYupnzEO6hwkyy9meJXTkM4Ve5vK6I4jiAJjwq39x2U9/W8gPt9AwgI=
+SHA256 (Pkgfile) = f2654792d3b5f2e0b28bbd00447e89994d2818f3dbd61c156fe3bbba47f723d8
+SHA256 (.footprint) = 26ff2049f39ad547cae38d8892577cdace0d8925e9aaa5a5ce72b3ef88d7dc24
 SHA256 (opengfx-0.5.4.zip) = 3d136d776906dbe8b5df1434cb9a68d1249511a3c4cfaca55cc24cc0028ae078
 SHA256 (opensfx-0.2.3.zip) = 3574745ac0c138bae53b56972591db8d778ad9faffd51deae37a48a563e71662
 SHA256 (openmsx-0.3.1.zip) = 92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5
-SHA256 (everything.patch) = 6205be9ee10e1cfeec8986e9be507564b8525920b8f4846c63e807409f4d8e02
+SHA256 (everything.patch) = fcc7898783ec3ffbe2f2b8d19bd5f0d9efaca459a2c1c4542677bbd7ea2530d4
 SHA256 (clipboard.grf) = 12b90fe53f2d61d2d45d74ecc6b97d3a5f041c4215a5c1b02a6b1ba162e4572a
-SHA256 (2406500140.tar.gz) = 2f733d5dc50c665ec3d3636d57c5d8d7289577e683947c0ae67d4a7d97c17f3a
+SHA256 (2b662b448c.tar.gz) = 46ec676c0bcaa0c8924e7fbb996cfe3df8bc238124008484cd1b90e35073212f
diff --git a/manualPorts/openttd-git/Pkgfile b/manualPorts/openttd-git/Pkgfile
index a7c1c0a..ecc194d 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=28112.2406500140
+version=28128.2b662b448c
 
 gfxversion=0.5.4
 sfxversion=0.2.3
diff --git a/manualPorts/openttd-git/everything.patch b/manualPorts/openttd-git/everything.patch
index cd7ce0b..3e8109f 100644
--- a/manualPorts/openttd-git/everything.patch
+++ b/manualPorts/openttd-git/everything.patch
@@ -1880,7 +1880,7 @@ index 000000000..47fffb238
 +  </g>
 +</svg>
 diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
-index f8daad6c9..8b92a930e 100644
+index 176b15d82..f895a5e1a 100644
 --- a/projects/openttd_vs100.vcxproj
 +++ b/projects/openttd_vs100.vcxproj
 @@ -325,6 +325,7 @@
@@ -1959,7 +1959,7 @@ index f8daad6c9..8b92a930e 100644
      <ClCompile Include="..\src\road_cmd.cpp" />
      <ClCompile Include="..\src\roadveh_cmd.cpp" />
 diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
-index c5dfab137..bfebba57b 100644
+index 3349f9954..633762d8c 100644
 --- a/projects/openttd_vs100.vcxproj.filters
 +++ b/projects/openttd_vs100.vcxproj.filters
 @@ -132,6 +132,9 @@
@@ -2062,7 +2062,7 @@ index c5dfab137..bfebba57b 100644
        <Filter>Command handlers</Filter>
      </ClCompile>
 diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
-index 88899bbbc..bc8b9759f 100644
+index b2c0a13bb..432f7b745 100644
 --- a/projects/openttd_vs80.vcproj
 +++ b/projects/openttd_vs80.vcproj
 @@ -482,6 +482,10 @@
@@ -2177,7 +2177,7 @@ index 88899bbbc..bc8b9759f 100644
  				RelativePath=".\..\src\rail_cmd.cpp"
  				>
 diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
-index 6fb57832d..98375bc95 100644
+index 33fad8573..d25097a5a 100644
 --- a/projects/openttd_vs90.vcproj
 +++ b/projects/openttd_vs90.vcproj
 @@ -479,6 +479,10 @@
@@ -2292,7 +2292,7 @@ index 6fb57832d..98375bc95 100644
  				RelativePath=".\..\src\rail_cmd.cpp"
  				>
 diff --git a/source.list b/source.list
-index 7555044d2..a7ca5de26 100644
+index 0a496f541..b53a24f54 100644
 --- a/source.list
 +++ b/source.list
 @@ -9,6 +9,7 @@ cargomonitor.cpp
@@ -5577,7 +5577,7 @@ index 359709e36..896ecd921 100644
  	}
  
 diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
-index d5959f5e1..82471510a 100644
+index f73027e91..f8e026767 100644
 --- a/src/gfxinit.cpp
 +++ b/src/gfxinit.cpp
 @@ -193,6 +193,9 @@ static void LoadSpriteTables()
@@ -5872,10 +5872,10 @@ index 185e84a80..e574c0799 100644
  
  	/* We update every tile every 256 ticks, so divide the map size by 2^8 = 256 */
 diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
-index 0e2ea20e6..68294c2dc 100644
+index bd8395506..11b60a5f2 100644
 --- a/src/lang/afrikaans.txt
 +++ b/src/lang/afrikaans.txt
-@@ -4866,10 +4866,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4864,10 +4864,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Spektator, {1:STRING}
  
  # Viewport strings
@@ -5895,10 +5895,10 @@ index 0e2ea20e6..68294c2dc 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/basque.txt b/src/lang/basque.txt
-index d40beb0a2..e029f4c99 100644
+index ddb3afb60..3be636c0b 100644
 --- a/src/lang/basque.txt
 +++ b/src/lang/basque.txt
-@@ -4729,10 +4729,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4727,10 +4727,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Ikuslea, {1:STRING}
  
  # Viewport strings
@@ -5918,10 +5918,10 @@ index d40beb0a2..e029f4c99 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
-index 96573910e..9c4f7de06 100644
+index c9aba3b21..00b2d0e11 100644
 --- a/src/lang/catalan.txt
 +++ b/src/lang/catalan.txt
-@@ -4885,10 +4885,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4883,10 +4883,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :{G=Masculin}Espectador, {1:STRING}
  
  # Viewport strings
@@ -10932,10 +10932,10 @@ index 000000000..2909a9c82
 +
 +STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 diff --git a/src/lang/danish.txt b/src/lang/danish.txt
-index 4a9202457..773735a3c 100644
+index 9dcc55c1f..9d2e257b4 100644
 --- a/src/lang/danish.txt
 +++ b/src/lang/danish.txt
-@@ -4884,10 +4884,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4882,10 +4882,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Tilskuer, {1:STRING}
  
  # Viewport strings
@@ -10955,10 +10955,10 @@ index 4a9202457..773735a3c 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
-index ad2bfe472..164c2c7bb 100644
+index 764a0fc10..6db63370d 100644
 --- a/src/lang/dutch.txt
 +++ b/src/lang/dutch.txt
-@@ -4884,10 +4884,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4882,10 +4882,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Toeschouwer, {1:STRING}
  
  # Viewport strings
@@ -10978,7 +10978,7 @@ index ad2bfe472..164c2c7bb 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/english.txt b/src/lang/english.txt
-index c844d0b0c..256ffe9bb 100644
+index 15acb5578..3315d5620 100644
 --- a/src/lang/english.txt
 +++ b/src/lang/english.txt
 @@ -232,6 +232,7 @@ STR_TOOLTIP_GROUP_ORDER                                         :{BLACK}Select g
@@ -11134,7 +11134,7 @@ index c844d0b0c..256ffe9bb 100644
  
  STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT                           :{WHITE}Change maximum map height
  STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Change snow line height
-@@ -3164,6 +3215,8 @@ STR_CARGO_RATING_OUTSTANDING                                    :Outstanding
+@@ -3163,6 +3214,8 @@ STR_CARGO_RATING_OUTSTANDING                                    :Outstanding
  STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centre main view on station location. Ctrl+Click opens a new viewport on station location
  STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Change name of station
  
@@ -11143,7 +11143,7 @@ index c844d0b0c..256ffe9bb 100644
  STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Show all trains which have this station on their schedule
  STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Show all road vehicles which have this station on their schedule
  STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Show all aircraft which have this station on their schedule
-@@ -3370,8 +3423,8 @@ STR_GROUP_REMOVE_ALL_VEHICLES                                   :Remove all vehi
+@@ -3369,8 +3422,8 @@ STR_GROUP_REMOVE_ALL_VEHICLES                                   :Remove all vehi
  
  STR_GROUP_RENAME_CAPTION                                        :{BLACK}Rename a group
  
@@ -11154,7 +11154,7 @@ index c844d0b0c..256ffe9bb 100644
  STR_GROUP_OCCUPANCY                                             :Current usage:
  STR_GROUP_OCCUPANCY_VALUE                                       :{NUM}%
  
-@@ -4143,6 +4196,8 @@ STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... tree
+@@ -4142,6 +4195,8 @@ STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... tree
  STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Name must be unique
  STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{1:STRING} in the way
  STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Not allowed while paused
@@ -11163,7 +11163,7 @@ index c844d0b0c..256ffe9bb 100644
  
  # Local authority errors
  STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} local authority refuses to allow this
-@@ -4222,6 +4277,8 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Can't bu
+@@ -4221,6 +4276,8 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Can't bu
  STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Can't build airport here...
  
  STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Adjoins more than one existing station/loading area
@@ -11183,7 +11183,7 @@ index c844d0b0c..256ffe9bb 100644
  # Group related errors
  STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Can't create group...
  STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Can't delete this group...
-@@ -4894,10 +4955,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4896,10 +4957,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Spectator, {1:STRING1}
  
  # Viewport strings
@@ -11202,7 +11202,7 @@ index c844d0b0c..256ffe9bb 100644
  
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
-@@ -4955,6 +5024,7 @@ STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLA
+@@ -4957,6 +5026,7 @@ STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLA
  STR_TINY_GROUP                                                  :{TINY_FONT}{GROUP}
  STR_BLACK_INT                                                   :{BLACK}{NUM}
  STR_ORANGE_INT                                                  :{ORANGE}{NUM}
@@ -11211,10 +11211,10 @@ index c844d0b0c..256ffe9bb 100644
  STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
  STR_BLACK_STRING                                                :{BLACK}{STRING}
 diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
-index bb63d32c4..b2a26f3ff 100644
+index dd1e7effa..81b1eaa02 100644
 --- a/src/lang/estonian.txt
 +++ b/src/lang/estonian.txt
-@@ -4923,10 +4923,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4921,10 +4921,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Vaatleja, {1:STRING}
  
  # Viewport strings
@@ -11234,10 +11234,10 @@ index bb63d32c4..b2a26f3ff 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt
-index d0f8e2252..d579b445a 100644
+index 9a17e2387..fabdfe8d0 100644
 --- a/src/lang/faroese.txt
 +++ b/src/lang/faroese.txt
-@@ -4371,10 +4371,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4369,10 +4369,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Eygleiðari, {1:STRING}
  
  # Viewport strings
@@ -11257,7 +11257,7 @@ index d0f8e2252..d579b445a 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/german.txt b/src/lang/german.txt
-index 71e8f14b9..774fe8826 100644
+index e91d83c28..0bc50c0a2 100644
 --- a/src/lang/german.txt
 +++ b/src/lang/german.txt
 @@ -233,6 +233,7 @@ STR_TOOLTIP_GROUP_ORDER                                         :{BLACK}Gruppier
@@ -11325,7 +11325,7 @@ index 71e8f14b9..774fe8826 100644
  # Industry cargoes window
  STR_INDUSTRY_CARGOES_INDUSTRY_CAPTION                           :{WHITE}Produktionskette für {STRING}
  STR_INDUSTRY_CARGOES_CARGO_CAPTION                              :{WHITE}Produktionskette für {STRING}
-@@ -3155,6 +3171,8 @@ STR_CARGO_RATING_OUTSTANDING                                    :Hervorragend
+@@ -3153,6 +3169,8 @@ STR_CARGO_RATING_OUTSTANDING                                    :Hervorragend
  STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Hauptansicht zur Station scrollen. Strg+Klick öffnet neue Zusatzansicht bei der Station
  STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Namen der Station ändern
  
@@ -11334,7 +11334,7 @@ index 71e8f14b9..774fe8826 100644
  STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Alle Züge, die diesen Bahnhof anfahren, anzeigen
  STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Alle Straßenfahrzeuge, die diese Station anfahren, anzeigen
  STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Alle Flugzeuge, die diesen Flughafen anfliegen, anzeigen
-@@ -3950,6 +3968,8 @@ STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Umschalt
+@@ -3948,6 +3966,8 @@ STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Umschalt
  STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :an
  STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :ab
  
@@ -11343,7 +11343,7 @@ index 71e8f14b9..774fe8826 100644
  
  # Date window (for timetable)
  STR_DATE_CAPTION                                                :{WHITE}Datum auswählen
-@@ -4885,10 +4905,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4883,10 +4903,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Zuschauer, {1:STRING}
  
  # Viewport strings
@@ -16354,10 +16354,10 @@ index 000000000..f0cc17660
 +
 +STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
-index 479bca6a7..8fa01c35c 100644
+index 3fe531977..86cc728e0 100644
 --- a/src/lang/icelandic.txt
 +++ b/src/lang/icelandic.txt
-@@ -4624,10 +4624,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4622,10 +4622,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Áhorfandi, {1:STRING}
  
  # Viewport strings
@@ -16377,10 +16377,10 @@ index 479bca6a7..8fa01c35c 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
-index 09b8dbb66..814971aa6 100644
+index 7c8c41700..c8eb8061f 100644
 --- a/src/lang/indonesian.txt
 +++ b/src/lang/indonesian.txt
-@@ -4865,10 +4865,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4863,10 +4863,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Penonton, {1:STRING}
  
  # Viewport strings
@@ -16400,10 +16400,10 @@ index 09b8dbb66..814971aa6 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/italian.txt b/src/lang/italian.txt
-index 0759f850e..4402b16f2 100644
+index 6d27d725f..d8b76ca72 100644
 --- a/src/lang/italian.txt
 +++ b/src/lang/italian.txt
-@@ -4924,10 +4924,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4923,10 +4923,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Spettatore, {1:STRING}
  
  # Viewport strings
@@ -21443,10 +21443,10 @@ index 000000000..988a95758
 +
 +STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
-index 639cd0467..707275b1d 100644
+index 324bacc92..0fe6ba4b0 100644
 --- a/src/lang/luxembourgish.txt
 +++ b/src/lang/luxembourgish.txt
-@@ -4884,10 +4884,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4882,10 +4882,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Zuschauer, {1:STRING}
  
  # Viewport strings
@@ -26456,10 +26456,10 @@ index 000000000..d1d26f75d
 +
 +STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
-index ba51b1139..70401dd90 100644
+index 449527190..7db7b0d4c 100644
 --- a/src/lang/norwegian_nynorsk.txt
 +++ b/src/lang/norwegian_nynorsk.txt
-@@ -4781,10 +4781,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4779,10 +4779,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Tilskuar, {1:STRING}
  
  # Viewport strings
@@ -26479,10 +26479,10 @@ index ba51b1139..70401dd90 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
-index ef966a474..605b9c612 100644
+index 82662903f..94432055a 100644
 --- a/src/lang/portuguese.txt
 +++ b/src/lang/portuguese.txt
-@@ -4885,10 +4885,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4883,10 +4883,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {1:STRING}
  
  # Viewport strings
@@ -26502,10 +26502,10 @@ index ef966a474..605b9c612 100644
  STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
  STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
-index 774205fa5..1991f3262 100644
+index 7dd3c4a54..f99f023dd 100644
 --- a/src/lang/spanish.txt
 +++ b/src/lang/spanish.txt
-@@ -4885,10 +4885,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
+@@ -4883,10 +4883,18 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
  STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {1:STRING}
  
  # Viewport strings
@@ -32335,7 +32335,7 @@ index 620885e5d..ee419d1f1 100644
  /**
   * Approximation of the length of a straight track, relative to a diagonal
 diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
-index 01e8d2c45..cb4f4eef0 100644
+index 5252832b5..f63dc8bc6 100644
 --- a/src/misc_gui.cpp
 +++ b/src/misc_gui.cpp
 @@ -123,15 +123,15 @@ public:
@@ -33603,7 +33603,7 @@ index 5bc97a58d..cac0c3dea 100644
 +	CopyPasteTile_Rail,       // copypaste_tile_proc
  };
 diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
-index 73fe29da0..f7c208319 100644
+index de8d43474..2288dcb85 100644
 --- a/src/rail_gui.cpp
 +++ b/src/rail_gui.cpp
 @@ -192,7 +192,7 @@ static void PlaceRail_Station(TileIndex tile)
@@ -34453,23 +34453,27 @@ index c4af229d5..c6ea68ccb 100644
  
  /**
 diff --git a/src/road_gui.cpp b/src/road_gui.cpp
-index 801d33435..5dcd5ffa8 100644
+index 6faa42262..2b7db72b7 100644
 --- a/src/road_gui.cpp
 +++ b/src/road_gui.cpp
-@@ -633,11 +633,11 @@ struct BuildRoadToolbarWindow : Window {
- 					break;
- 
- 				case DDSP_BUILD_BUSSTOP:
--					PlaceRoadStop(start_tile, end_tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_BUS]));
-+					PlaceRoadStop(start_tile, end_tile, ((_settings_game.station.adjacent_stations && _ctrl_pressed) << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_BUS]));
+@@ -639,7 +639,7 @@ struct BuildRoadToolbarWindow : Window {
+ 							TileArea ta(start_tile, end_tile);
+ 							DoCommandP(ta.tile, ta.w | ta.h << 8, (_ctrl_pressed << 1) | ROADSTOP_BUS, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[ROADSTOP_BUS]), CcPlaySound_SPLAT_OTHER);
+ 						} else {
+-							PlaceRoadStop(start_tile, end_tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_BUS]));
++							PlaceRoadStop(start_tile, end_tile, ((_settings_game.station.adjacent_stations && _ctrl_pressed) << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_BUS]));
+ 						}
+ 					}
  					break;
- 
- 				case DDSP_BUILD_TRUCKSTOP:
--					PlaceRoadStop(start_tile, end_tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_TRUCK, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_TRUCK]));
-+					PlaceRoadStop(start_tile, end_tile, ((_settings_game.station.adjacent_stations && _ctrl_pressed) << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_TRUCK, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_TRUCK]));
+@@ -651,7 +651,7 @@ struct BuildRoadToolbarWindow : Window {
+ 							TileArea ta(start_tile, end_tile);
+ 							DoCommandP(ta.tile, ta.w | ta.h << 8, (_ctrl_pressed << 1) | ROADSTOP_TRUCK, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[ROADSTOP_TRUCK]), CcPlaySound_SPLAT_OTHER);
+ 						} else {
+-							PlaceRoadStop(start_tile, end_tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_TRUCK, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_TRUCK]));
++							PlaceRoadStop(start_tile, end_tile, ((_settings_game.station.adjacent_stations && _ctrl_pressed) << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_TRUCK, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_TRUCK]));
+ 						}
+ 					}
  					break;
- 
- 				case DDSP_REMOVE_BUSSTOP: {
 diff --git a/src/road_map.h b/src/road_map.h
 index 693730294..d1bfaec8c 100644
 --- a/src/road_map.h
@@ -35059,7 +35063,7 @@ index 693730294..d1bfaec8c 100644
  
  #endif /* ROAD_MAP_H */
 diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
-index fcabf477f..e2a858151 100644
+index 7d0007fd2..dc714d314 100644
 --- a/src/roadveh_cmd.cpp
 +++ b/src/roadveh_cmd.cpp
 @@ -1153,7 +1153,7 @@ bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *prev)
@@ -39118,7 +39122,7 @@ index fc4059c7b..7c17ca816 100644
  	uint32 terraform_per_64k_frames;         ///< how many tile heights may, over a long period, be terraformed per 65536 frames?
  	uint16 terraform_frame_burst;            ///< how many tile heights may, over a short period, be terraformed?
 diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
-index 771863a24..d27f3ba0d 100644
+index 967cd4e1d..784ed9e31 100644
 --- a/src/ship_cmd.cpp
 +++ b/src/ship_cmd.cpp
 @@ -611,7 +611,7 @@ static void ShipController(Ship *v)
@@ -40233,7 +40237,7 @@ index 5e16b0d54..8357a530f 100644
  
  	/* virtual */ inline bool TileBelongsToRailStation(TileIndex tile) const
 diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
-index 07780de13..b78244cea 100644
+index 07db05856..946254936 100644
 --- a/src/station_cmd.cpp
 +++ b/src/station_cmd.cpp
 @@ -13,6 +13,9 @@
@@ -40463,7 +40467,7 @@ index 07780de13..b78244cea 100644
  }
  
  CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags);
-@@ -1081,24 +1223,24 @@ template <class T, StringID error_message>
+@@ -1083,24 +1225,24 @@ template <class T, StringID error_message>
  CommandCost FindJoiningBaseStation(StationID existing_station, StationID station_to_join, bool adjacent, TileArea ta, T **st)
  {
  	assert(*st == NULL);
@@ -40505,7 +40509,7 @@ index 07780de13..b78244cea 100644
  		}
  	}
  
-@@ -1108,8 +1250,23 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station
+@@ -1110,8 +1252,23 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station
  		if (ret.Failed()) return ret;
  	}
  
@@ -40530,7 +40534,7 @@ index 07780de13..b78244cea 100644
  
  	return CommandCost();
  }
-@@ -1218,10 +1375,8 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
+@@ -1220,10 +1377,8 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
  
  	bool reuse = (station_to_join != NEW_STATION);
  	if (!reuse) station_to_join = INVALID_STATION;
@@ -40542,7 +40546,7 @@ index 07780de13..b78244cea 100644
  	if (h_org > _settings_game.station.station_spread || w_org > _settings_game.station.station_spread) return CMD_ERROR;
  
  	/* these values are those that will be stored in train_tile and station_platforms */
-@@ -1251,14 +1406,22 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
+@@ -1253,14 +1408,22 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
  
  	/* Check if we can allocate a custom stationspec to this station */
  	const StationSpec *statspec = StationClass::Get(spec_class)->GetSpec(spec_index);
@@ -40568,7 +40572,7 @@ index 07780de13..b78244cea 100644
  			return CMD_ERROR;
  		}
  
-@@ -1279,6 +1442,7 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
+@@ -1281,6 +1444,7 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
  		st->AddFacility(FACIL_TRAIN, new_location.tile);
  
  		st->rect.BeforeAddRect(tile_org, w_org, h_org, StationRect::ADD_TRY);
@@ -40576,7 +40580,7 @@ index 07780de13..b78244cea 100644
  
  		if (statspec != NULL) {
  			/* Include this station spec's animation trigger bitmask
-@@ -1330,7 +1494,9 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
+@@ -1332,7 +1496,9 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
  				if (!IsStationTileBlocked(tile)) c->infrastructure.rail[rt]++;
  				c->infrastructure.station++;
  
@@ -40587,7 +40591,7 @@ index 07780de13..b78244cea 100644
  					/* Use a fixed axis for GetPlatformInfo as our platforms / numtracks are always the right way around */
  					uint32 platinfo = GetPlatformInfo(AXIS_X, GetStationGfx(tile), plat_len, numtracks_orig, plat_len - w, numtracks_orig - numtracks, false);
  
-@@ -1343,7 +1509,9 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
+@@ -1345,7 +1511,9 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
  							ErrorUnknownCallbackResult(statspec->grf_prop.grffile->grfid, CBID_STATION_TILE_LAYOUT, callback);
  						}
  					}
@@ -40597,7 +40601,7 @@ index 07780de13..b78244cea 100644
  					/* Trigger station animation -- after building? */
  					TriggerStationAnimation(st, tile, SAT_BUILT);
  				}
-@@ -1517,6 +1685,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector<T *, 4> &affected
+@@ -1519,6 +1687,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector<T *, 4> &affected
  			Track track = GetRailStationTrack(tile);
  			Owner owner = GetTileOwner(tile);
  			RailType rt = GetRailType(tile);
@@ -40605,7 +40609,7 @@ index 07780de13..b78244cea 100644
  			Train *v = NULL;
  
  			if (HasStationReservation(tile)) {
-@@ -1530,6 +1699,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector<T *, 4> &affected
+@@ -1532,6 +1701,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector<T *, 4> &affected
  			DoClearSquare(tile);
  			DeleteNewGRFInspectWindow(GSF_STATIONS, tile);
  			if (build_rail) MakeRailNormal(tile, owner, TrackToTrackBits(track), rt);
@@ -40613,7 +40617,7 @@ index 07780de13..b78244cea 100644
  			Company::Get(owner)->infrastructure.station--;
  			DirtyCompanyInfrastructureWindows(owner);
  
-@@ -1596,6 +1766,7 @@ CommandCost CmdRemoveFromRailStation(TileIndex start, DoCommandFlag flags, uint3
+@@ -1598,6 +1768,7 @@ CommandCost CmdRemoveFromRailStation(TileIndex start, DoCommandFlag flags, uint3
  		Station *st = *stp;
  
  		if (st->train_station.tile == INVALID_TILE) SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_TRAINS);
@@ -40621,7 +40625,7 @@ index 07780de13..b78244cea 100644
  		st->MarkTilesDirty(false);
  		st->RecomputeIndustriesNear();
  	}
-@@ -1762,7 +1933,6 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
+@@ -1764,7 +1935,6 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
  	StationID station_to_join = GB(p2, 16, 16);
  	bool reuse = (station_to_join != NEW_STATION);
  	if (!reuse) station_to_join = INVALID_STATION;
@@ -40629,7 +40633,7 @@ index 07780de13..b78244cea 100644
  
  	uint8 width = (uint8)GB(p1, 0, 8);
  	uint8 lenght = (uint8)GB(p1, 8, 8);
-@@ -1776,7 +1946,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
+@@ -1778,7 +1948,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
  
  	TileArea roadstop_area(tile, width, lenght);
  
@@ -40638,7 +40642,7 @@ index 07780de13..b78244cea 100644
  
  	if (!HasExactlyOneBit(rts) || !HasRoadTypesAvail(_current_company, rts)) return CMD_ERROR;
  
-@@ -1841,6 +2011,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
+@@ -1843,6 +2013,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
  			st->AddFacility((type) ? FACIL_TRUCK_STOP : FACIL_BUS_STOP, cur_tile);
  
  			st->rect.BeforeAddTile(cur_tile, StationRect::ADD_TRY);
@@ -40646,7 +40650,7 @@ index 07780de13..b78244cea 100644
  
  			RoadStopType rs_type = type ? ROADSTOP_TRUCK : ROADSTOP_BUS;
  			if (is_drive_through) {
-@@ -1970,6 +2141,7 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlag flags)
+@@ -1972,6 +2143,7 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlag flags)
  			DoClearSquare(tile);
  		}
  
@@ -40654,7 +40658,7 @@ index 07780de13..b78244cea 100644
  		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_ROADVEHS);
  		delete cur_stop;
  
-@@ -1983,6 +2155,7 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlag flags)
+@@ -1985,6 +2157,7 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlag flags)
  		}
  
  		st->rect.AfterRemoveTile(st, tile);
@@ -40662,7 +40666,7 @@ index 07780de13..b78244cea 100644
  
  		st->UpdateVirtCoord();
  		st->RecomputeIndustriesNear();
-@@ -2191,11 +2364,10 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
+@@ -2193,11 +2366,10 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
  	StationID station_to_join = GB(p2, 16, 16);
  	bool reuse = (station_to_join != NEW_STATION);
  	if (!reuse) station_to_join = INVALID_STATION;
@@ -40675,7 +40679,7 @@ index 07780de13..b78244cea 100644
  
  	if (airport_type >= NUM_AIRPORTS) return CMD_ERROR;
  
-@@ -2256,9 +2428,6 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
+@@ -2258,9 +2430,6 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
  	ret = FindJoiningStation(INVALID_STATION, station_to_join, HasBit(p2, 0), airport_area, &st);
  	if (ret.Failed()) return ret;
  
@@ -40685,7 +40689,7 @@ index 07780de13..b78244cea 100644
  	ret = BuildStationPart(&st, flags, reuse, airport_area, (GetAirport(airport_type)->flags & AirportFTAClass::AIRPLANES) ? STATIONNAMING_AIRPORT : STATIONNAMING_HELIPORT);
  	if (ret.Failed()) return ret;
  
-@@ -2286,6 +2455,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
+@@ -2288,6 +2457,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
  			MakeAirport(iter, st->owner, st->index, iter.GetStationGfx(), WATER_CLASS_INVALID);
  			SetStationTileRandomBits(iter, GB(Random(), 0, 4));
  			st->airport.Add(iter);
@@ -40693,7 +40697,7 @@ index 07780de13..b78244cea 100644
  
  			if (AirportTileSpec::Get(GetTranslatedAirportTileID(iter.GetStationGfx()))->animation.status != ANIM_STATUS_NO_ANIMATION) AddAnimatedTile(iter);
  		}
-@@ -2359,8 +2529,10 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
+@@ -2361,8 +2531,10 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
  		cost.AddCost(_price[PR_CLEAR_STATION_AIRPORT]);
  
  		if (flags & DC_EXEC) {
@@ -40704,7 +40708,7 @@ index 07780de13..b78244cea 100644
  			DoClearSquare(tile_cur);
  			DeleteNewGRFInspectWindow(GSF_AIRPORTTILES, tile_cur);
  		}
-@@ -2470,9 +2642,8 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
+@@ -2472,9 +2644,8 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
  	StationID station_to_join = GB(p2, 16, 16);
  	bool reuse = (station_to_join != NEW_STATION);
  	if (!reuse) station_to_join = INVALID_STATION;
@@ -40715,7 +40719,7 @@ index 07780de13..b78244cea 100644
  
  	DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(tile));
  	if (direction == INVALID_DIAGDIR) return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
-@@ -2491,21 +2662,30 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
+@@ -2493,21 +2664,30 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
  
  	TileIndex tile_cur = tile + TileOffsByDiagDir(direction);
  
@@ -40754,7 +40758,7 @@ index 07780de13..b78244cea 100644
  	}
  
  	TileArea dock_area = TileArea(tile + ToTileIndexDiff(_dock_tileoffs_chkaround[direction]),
-@@ -2516,9 +2696,6 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
+@@ -2518,9 +2698,6 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
  	ret = FindJoiningStation(INVALID_STATION, station_to_join, HasBit(p1, 0), dock_area, &st);
  	if (ret.Failed()) return ret;
  
@@ -40764,7 +40768,7 @@ index 07780de13..b78244cea 100644
  	ret = BuildStationPart(&st, flags, reuse, dock_area, STATIONNAMING_DOCK);
  	if (ret.Failed()) return ret;
  
-@@ -2529,6 +2706,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
+@@ -2531,6 +2708,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
  		st->AddFacility(FACIL_DOCK, tile);
  
  		st->rect.BeforeAddRect(dock_area.tile, dock_area.w, dock_area.h, StationRect::ADD_TRY);
@@ -40772,7 +40776,7 @@ index 07780de13..b78244cea 100644
  
  		/* If the water part of the dock is on a canal, update infrastructure counts.
  		 * This is needed as we've unconditionally cleared that tile before. */
-@@ -2538,6 +2716,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
+@@ -2540,6 +2718,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
  		Company::Get(st->owner)->infrastructure.station += 2;
  		DirtyCompanyInfrastructureWindows(st->owner);
  
@@ -40780,7 +40784,7 @@ index 07780de13..b78244cea 100644
  		MakeDock(tile, st->owner, st->index, direction, wc);
  
  		st->UpdateVirtCoord();
-@@ -2573,10 +2752,13 @@ static CommandCost RemoveDock(TileIndex tile, DoCommandFlag flags)
+@@ -2575,10 +2754,13 @@ static CommandCost RemoveDock(TileIndex tile, DoCommandFlag flags)
  	if (ret.Failed()) return ret;
  
  	if (flags & DC_EXEC) {
@@ -40794,7 +40798,7 @@ index 07780de13..b78244cea 100644
  		st->rect.AfterRemoveTile(st, tile1);
  		st->rect.AfterRemoveTile(st, tile2);
  
-@@ -2901,6 +3083,8 @@ draw_default_foundation:
+@@ -2903,6 +3085,8 @@ draw_default_foundation:
  		}
  	}
  
@@ -40803,7 +40807,7 @@ index 07780de13..b78244cea 100644
  	if (HasStationRail(ti->tile) && HasRailCatenaryDrawn(GetRailType(ti->tile))) DrawRailCatenary(ti);
  
  	if (HasBit(roadtypes, ROADTYPE_TRAM)) {
-@@ -3660,6 +3844,615 @@ void StationMonthlyLoop()
+@@ -3662,6 +3846,615 @@ void StationMonthlyLoop()
  }
  
  
@@ -41419,7 +41423,7 @@ index 07780de13..b78244cea 100644
  void ModifyStationRatingAround(TileIndex tile, Owner owner, int amount, uint radius)
  {
  	Station *st;
-@@ -3922,6 +4715,7 @@ void BuildOilRig(TileIndex tile)
+@@ -3924,6 +4717,7 @@ void BuildOilRig(TileIndex tile)
  	st->build_date = _date;
  
  	st->rect.BeforeAddTile(tile, StationRect::ADD_FORCE);
@@ -41427,7 +41431,7 @@ index 07780de13..b78244cea 100644
  
  	st->UpdateVirtCoord();
  	UpdateStationAcceptance(st, false);
-@@ -3932,6 +4726,7 @@ void DeleteOilRig(TileIndex tile)
+@@ -3934,6 +4728,7 @@ void DeleteOilRig(TileIndex tile)
  {
  	Station *st = Station::GetByTile(tile);
  
@@ -41435,7 +41439,7 @@ index 07780de13..b78244cea 100644
  	MakeWaterKeepingClass(tile, OWNER_NONE);
  
  	st->dock_tile = INVALID_TILE;
-@@ -3939,6 +4734,7 @@ void DeleteOilRig(TileIndex tile)
+@@ -3941,6 +4736,7 @@ void DeleteOilRig(TileIndex tile)
  	st->facilities &= ~(FACIL_AIRPORT | FACIL_DOCK);
  	st->airport.flags = 0;
  
@@ -41443,7 +41447,7 @@ index 07780de13..b78244cea 100644
  	st->rect.AfterRemoveTile(st, tile);
  
  	st->UpdateVirtCoord();
-@@ -4537,4 +5333,5 @@ extern const TileTypeProcs _tile_type_station_procs = {
+@@ -4539,4 +5335,5 @@ extern const TileTypeProcs _tile_type_station_procs = {
  	VehicleEnter_Station,       // vehicle_enter_tile_proc
  	GetFoundation_Station,      // get_foundation_proc
  	TerraformTile_Station,      // terraform_tile_proc
@@ -44801,7 +44805,7 @@ index 0575b0a37..b142ef79e 100644
  
  
 diff --git a/src/town_gui.cpp b/src/town_gui.cpp
-index 1d604634d..7e7a1132f 100644
+index 16de241c6..c13995938 100644
 --- a/src/town_gui.cpp
 +++ b/src/town_gui.cpp
 @@ -154,15 +154,7 @@ public:
@@ -45131,7 +45135,7 @@ index 68de827ef..f36db07a0 100644
 +
  #endif /* TRACK_FUNC_H */
 diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
-index fb1d2b1ee..7626666d0 100644
+index 9f4ecbea6..bb27e9235 100644
 --- a/src/train_cmd.cpp
 +++ b/src/train_cmd.cpp
 @@ -1872,6 +1872,17 @@ void ReverseTrainDirection(Train *v)
@@ -46782,7 +46786,7 @@ index b4c790722..f00588eb7 100644
  				y >= v->coord.top && y <= v->coord.bottom) {
  
 diff --git a/src/vehicle_base.h b/src/vehicle_base.h
-index fc40f22a6..06c60d57a 100644
+index 73f499c48..a9db20a92 100644
 --- a/src/vehicle_base.h
 +++ b/src/vehicle_base.h
 @@ -353,6 +353,12 @@ public:
@@ -47031,7 +47035,7 @@ index cbdcc5019..fb6008d1a 100644
 +#endif /* VIEWPORT_FUNC_H */
 \ No newline at end of file
 diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
-index cbd300dec..1a09e97f9 100644
+index 9c89a85f8..60ded314f 100644
 --- a/src/viewport_gui.cpp
 +++ b/src/viewport_gui.cpp
 @@ -16,6 +16,7 @@
@@ -48201,7 +48205,7 @@ index 187659f36..57c964e70 100644
  
  #endif /* WIDGETS_VIEWPORT_WIDGET_H */
 diff --git a/src/window.cpp b/src/window.cpp
-index 30c1b8705..094e62313 100644
+index e2ce84542..460a8f79b 100644
 --- a/src/window.cpp
 +++ b/src/window.cpp
 @@ -2774,6 +2774,7 @@ enum MouseClick {