openttd-git: 28063.34b63930f-1 -> 28064.8e4bce58e-1

2 files changed, 62 insertions, 62 deletions

diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD
index de8e7166..6c72a97c 100755
--- a/openttd-git/PKGBUILD
+++ b/openttd-git/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 pkgname=openttd-git
-pkgver=28063.34b63930f
+pkgver=28064.8e4bce58e
 _commit=${pkgver#*.}
 pkgrel=1
 pkgdesc="A FOSS clone of Transport Tycoon Deluxe."
@@ -37,7 +37,7 @@ source=(
     "clipboard.grf"
 )
 sha512sums=('SKIP'
-            '20231f23f0c0ec5df710b541b628b3a479299368975b0bd8c28d979b94c7dc376f55018f470d1559bfdc732a4de82793a82e79751fc7e3a10feb2b5eecfb7598'
+            '8a3ec245ab70642df2ea26212c3f54ef17ab2e4757ee4fcbcfb8f34874751f6d2aa468d219d1d6c00877da065eb8daf98567b42c1bb0abc3c873dd409699ae86'
             'aa1f5d5c4fd9ff487bc03ed5c10701e99ae9fd29ae0cd65a06171486298558d1c26ced49ac8687acc5b1003a6538f6c83917992348cbd2b7426afdf0759cb1a5')
 
 pkgver() {
diff --git a/openttd-git/everything.patch b/openttd-git/everything.patch
index 69ad782e..2c27ba64 100644
--- a/openttd-git/everything.patch
+++ b/openttd-git/everything.patch
@@ -1880,10 +1880,10 @@ index 000000000..47fffb238
 +  </g>
 +</svg>
 diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
-index d9a3ecf80..85e806466 100644
+index 8a54e9712..79f9a886c 100644
 --- a/projects/openttd_vs100.vcxproj
 +++ b/projects/openttd_vs100.vcxproj
-@@ -313,6 +313,7 @@
+@@ -325,6 +325,7 @@
      <ClCompile Include="..\src\cargopacket.cpp" />
      <ClCompile Include="..\src\cargotype.cpp" />
      <ClCompile Include="..\src\cheat.cpp" />
@@ -1891,7 +1891,7 @@ index d9a3ecf80..85e806466 100644
      <ClCompile Include="..\src\command.cpp" />
      <ClCompile Include="..\src\console.cpp" />
      <ClCompile Include="..\src\console_cmds.cpp" />
-@@ -424,6 +425,9 @@
+@@ -436,6 +437,9 @@
      <ClInclude Include="..\src\cheat_func.h" />
      <ClInclude Include="..\src\cheat_type.h" />
      <ClInclude Include="..\src\clear_func.h" />
@@ -1901,7 +1901,7 @@ index d9a3ecf80..85e806466 100644
      <ClInclude Include="..\src\cmd_helper.h" />
      <ClInclude Include="..\src\command_func.h" />
      <ClInclude Include="..\src\command_type.h" />
-@@ -436,6 +440,7 @@
+@@ -448,6 +452,7 @@
      <ClInclude Include="..\src\console_gui.h" />
      <ClInclude Include="..\src\console_internal.h" />
      <ClInclude Include="..\src\console_type.h" />
@@ -1909,7 +1909,7 @@ index d9a3ecf80..85e806466 100644
      <ClInclude Include="..\src\cpu.h" />
      <ClInclude Include="..\src\crashlog.h" />
      <ClInclude Include="..\src\currency.h" />
-@@ -568,6 +573,8 @@
+@@ -580,6 +585,8 @@
      <ClInclude Include="..\src\order_base.h" />
      <ClInclude Include="..\src\order_func.h" />
      <ClInclude Include="..\src\order_type.h" />
@@ -1918,7 +1918,7 @@ index d9a3ecf80..85e806466 100644
      <ClInclude Include="..\src\pbs.h" />
      <ClInclude Include="..\src\progress.h" />
      <ClInclude Include="..\src\querystring_gui.h" />
-@@ -633,6 +640,7 @@
+@@ -645,6 +652,7 @@
      <ClInclude Include="..\src\tgp.h" />
      <ClInclude Include="..\src\tile_cmd.h" />
      <ClInclude Include="..\src\tile_type.h" />
@@ -1926,7 +1926,7 @@ index d9a3ecf80..85e806466 100644
      <ClInclude Include="..\src\tilearea_type.h" />
      <ClInclude Include="..\src\tilehighlight_func.h" />
      <ClInclude Include="..\src\tilehighlight_type.h" />
-@@ -707,6 +715,7 @@
+@@ -719,6 +727,7 @@
      <ClCompile Include="..\src\bridge_gui.cpp" />
      <ClCompile Include="..\src\build_vehicle_gui.cpp" />
      <ClCompile Include="..\src\cheat_gui.cpp" />
@@ -1934,7 +1934,7 @@ index d9a3ecf80..85e806466 100644
      <ClCompile Include="..\src\company_gui.cpp" />
      <ClCompile Include="..\src\console_gui.cpp" />
      <ClCompile Include="..\src\date_gui.cpp" />
-@@ -764,6 +773,7 @@
+@@ -776,6 +785,7 @@
      <ClInclude Include="..\src\widgets\bridge_widget.h" />
      <ClInclude Include="..\src\widgets\build_vehicle_widget.h" />
      <ClInclude Include="..\src\widgets\cheat_widget.h" />
@@ -1942,7 +1942,7 @@ index d9a3ecf80..85e806466 100644
      <ClInclude Include="..\src\widgets\company_widget.h" />
      <ClInclude Include="..\src\widgets\console_widget.h" />
      <ClInclude Include="..\src\widgets\date_widget.h" />
-@@ -817,6 +827,7 @@
+@@ -829,6 +839,7 @@
      <ClCompile Include="..\src\aircraft_cmd.cpp" />
      <ClCompile Include="..\src\autoreplace_cmd.cpp" />
      <ClCompile Include="..\src\clear_cmd.cpp" />
@@ -1950,7 +1950,7 @@ index d9a3ecf80..85e806466 100644
      <ClCompile Include="..\src\company_cmd.cpp" />
      <ClCompile Include="..\src\depot_cmd.cpp" />
      <ClCompile Include="..\src\group_cmd.cpp" />
-@@ -824,6 +835,7 @@
+@@ -836,6 +847,7 @@
      <ClCompile Include="..\src\misc_cmd.cpp" />
      <ClCompile Include="..\src\object_cmd.cpp" />
      <ClCompile Include="..\src\order_cmd.cpp" />
@@ -1959,7 +1959,7 @@ index d9a3ecf80..85e806466 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 06800ffda..c561077ac 100644
+index d50273379..7721162a3 100644
 --- a/projects/openttd_vs100.vcxproj.filters
 +++ b/projects/openttd_vs100.vcxproj.filters
 @@ -132,6 +132,9 @@
@@ -2062,10 +2062,10 @@ index 06800ffda..c561077ac 100644
        <Filter>Command handlers</Filter>
      </ClCompile>
 diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
-index 70dcab226..c7f6aa61e 100644
+index b0ac66036..64434e061 100644
 --- a/projects/openttd_vs80.vcproj
 +++ b/projects/openttd_vs80.vcproj
-@@ -474,6 +474,10 @@
+@@ -482,6 +482,10 @@
  				RelativePath=".\..\src\cheat.cpp"
  				>
  			</File>
@@ -2076,7 +2076,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\command.cpp"
  				>
-@@ -922,6 +926,18 @@
+@@ -930,6 +934,18 @@
  				RelativePath=".\..\src\clear_func.h"
  				>
  			</File>
@@ -2095,7 +2095,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\cmd_helper.h"
  				>
-@@ -970,6 +986,10 @@
+@@ -978,6 +994,10 @@
  				RelativePath=".\..\src\console_type.h"
  				>
  			</File>
@@ -2106,7 +2106,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\cpu.h"
  				>
-@@ -1498,6 +1518,14 @@
+@@ -1506,6 +1526,14 @@
  				RelativePath=".\..\src\order_type.h"
  				>
  			</File>
@@ -2121,7 +2121,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\pbs.h"
  				>
-@@ -1758,6 +1786,10 @@
+@@ -1766,6 +1794,10 @@
  				RelativePath=".\..\src\tile_type.h"
  				>
  			</File>
@@ -2132,7 +2132,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\tilearea_type.h"
  				>
-@@ -2062,6 +2094,10 @@
+@@ -2070,6 +2102,10 @@
  				RelativePath=".\..\src\cheat_gui.cpp"
  				>
  			</File>
@@ -2143,7 +2143,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\company_gui.cpp"
  				>
-@@ -2294,6 +2330,10 @@
+@@ -2302,6 +2338,10 @@
  				RelativePath=".\..\src\widgets\cheat_widget.h"
  				>
  			</File>
@@ -2154,7 +2154,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\widgets\company_widget.h"
  				>
-@@ -2510,6 +2550,10 @@
+@@ -2518,6 +2558,10 @@
  				RelativePath=".\..\src\clear_cmd.cpp"
  				>
  			</File>
@@ -2165,7 +2165,7 @@ index 70dcab226..c7f6aa61e 100644
  			<File
  				RelativePath=".\..\src\company_cmd.cpp"
  				>
-@@ -2538,6 +2582,10 @@
+@@ -2546,6 +2590,10 @@
  				RelativePath=".\..\src\order_cmd.cpp"
  				>
  			</File>
@@ -2177,10 +2177,10 @@ index 70dcab226..c7f6aa61e 100644
  				RelativePath=".\..\src\rail_cmd.cpp"
  				>
 diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
-index dd722d085..83acba849 100644
+index 8f379e6e6..f600d6044 100644
 --- a/projects/openttd_vs90.vcproj
 +++ b/projects/openttd_vs90.vcproj
-@@ -471,6 +471,10 @@
+@@ -479,6 +479,10 @@
  				RelativePath=".\..\src\cheat.cpp"
  				>
  			</File>
@@ -2191,7 +2191,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\command.cpp"
  				>
-@@ -919,6 +923,18 @@
+@@ -927,6 +931,18 @@
  				RelativePath=".\..\src\clear_func.h"
  				>
  			</File>
@@ -2210,7 +2210,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\cmd_helper.h"
  				>
-@@ -967,6 +983,10 @@
+@@ -975,6 +991,10 @@
  				RelativePath=".\..\src\console_type.h"
  				>
  			</File>
@@ -2221,7 +2221,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\cpu.h"
  				>
-@@ -1495,6 +1515,14 @@
+@@ -1503,6 +1523,14 @@
  				RelativePath=".\..\src\order_type.h"
  				>
  			</File>
@@ -2236,7 +2236,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\pbs.h"
  				>
-@@ -1755,6 +1783,10 @@
+@@ -1763,6 +1791,10 @@
  				RelativePath=".\..\src\tile_type.h"
  				>
  			</File>
@@ -2247,7 +2247,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\tilearea_type.h"
  				>
-@@ -2059,6 +2091,10 @@
+@@ -2067,6 +2099,10 @@
  				RelativePath=".\..\src\cheat_gui.cpp"
  				>
  			</File>
@@ -2258,7 +2258,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\company_gui.cpp"
  				>
-@@ -2291,6 +2327,10 @@
+@@ -2299,6 +2335,10 @@
  				RelativePath=".\..\src\widgets\cheat_widget.h"
  				>
  			</File>
@@ -2269,7 +2269,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\widgets\company_widget.h"
  				>
-@@ -2507,6 +2547,10 @@
+@@ -2515,6 +2555,10 @@
  				RelativePath=".\..\src\clear_cmd.cpp"
  				>
  			</File>
@@ -2280,7 +2280,7 @@ index dd722d085..83acba849 100644
  			<File
  				RelativePath=".\..\src\company_cmd.cpp"
  				>
-@@ -2535,6 +2579,10 @@
+@@ -2543,6 +2587,10 @@
  				RelativePath=".\..\src\order_cmd.cpp"
  				>
  			</File>
@@ -2292,7 +2292,7 @@ index dd722d085..83acba849 100644
  				RelativePath=".\..\src\rail_cmd.cpp"
  				>
 diff --git a/source.list b/source.list
-index df35cdd26..7a1c40274 100644
+index cd823aa6f..dbebb1151 100644
 --- a/source.list
 +++ b/source.list
 @@ -9,6 +9,7 @@ cargomonitor.cpp
@@ -4112,7 +4112,7 @@ index 000000000..e3b19803d
 +
 +#endif /* CLIPBOARD_TYPE_H */
 diff --git a/src/command.cpp b/src/command.cpp
-index 959610cd2..58e7ed610 100644
+index df0cd004c..bca03f295 100644
 --- a/src/command.cpp
 +++ b/src/command.cpp
 @@ -34,6 +34,7 @@
@@ -4123,7 +4123,7 @@ index 959610cd2..58e7ed610 100644
  CommandProc CmdRemoveSingleRail;
  
  CommandProc CmdLandscapeClear;
-@@ -198,6 +199,10 @@ CommandProc CmdSetTimetableStart;
+@@ -199,6 +200,10 @@ CommandProc CmdSetTimetableStart;
  
  CommandProc CmdOpenCloseAirport;
  
@@ -4134,7 +4134,7 @@ index 959610cd2..58e7ed610 100644
  #define DEF_CMD(proc, flags, type) {proc, #proc, (CommandFlags)flags, type}
  
  /**
-@@ -211,6 +216,7 @@ static const Command _command_proc_table[] = {
+@@ -212,6 +217,7 @@ static const Command _command_proc_table[] = {
  	DEF_CMD(CmdBuildRailroadTrack,       CMD_NO_WATER | CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_BUILD_RAILROAD_TRACK
  	DEF_CMD(CmdRemoveRailroadTrack,                     CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_REMOVE_RAILROAD_TRACK
  	DEF_CMD(CmdBuildSingleRail,          CMD_NO_WATER | CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_BUILD_SINGLE_RAIL
@@ -4142,7 +4142,7 @@ index 959610cd2..58e7ed610 100644
  	DEF_CMD(CmdRemoveSingleRail,                        CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_REMOVE_SINGLE_RAIL
  	DEF_CMD(CmdLandscapeClear,                                 0, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_LANDSCAPE_CLEAR
  	DEF_CMD(CmdBuildBridge,  CMD_DEITY | CMD_NO_WATER | CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_BUILD_BRIDGE
-@@ -354,6 +360,10 @@ static const Command _command_proc_table[] = {
+@@ -356,6 +362,10 @@ static const Command _command_proc_table[] = {
  	DEF_CMD(CmdSetTimetableStart,                              0, CMDT_ROUTE_MANAGEMENT      ), // CMD_SET_TIMETABLE_START
  
  	DEF_CMD(CmdOpenCloseAirport,                               0, CMDT_ROUTE_MANAGEMENT      ), // CMD_OPEN_CLOSE_AIRPORT
@@ -4166,7 +4166,7 @@ index 336947567..de037e68b 100644
 +
  #endif /* COMMAND_FUNC_H */
 diff --git a/src/command_type.h b/src/command_type.h
-index f318216ac..091585b4e 100644
+index 0a2fde297..b3a125dd9 100644
 --- a/src/command_type.h
 +++ b/src/command_type.h
 @@ -162,6 +162,21 @@ public:
@@ -4199,7 +4199,7 @@ index f318216ac..091585b4e 100644
  	CMD_REMOVE_SINGLE_RAIL,           ///< remove a single rail track
  	CMD_LANDSCAPE_CLEAR,              ///< demolish a tile
  	CMD_BUILD_BRIDGE,                 ///< build a bridge
-@@ -329,6 +345,10 @@ enum Commands {
+@@ -331,6 +347,10 @@ enum Commands {
  
  	CMD_OPEN_CLOSE_AIRPORT,           ///< open/close an airport to incoming aircraft
  
@@ -4210,7 +4210,7 @@ index f318216ac..091585b4e 100644
  	CMD_END,                          ///< Must ALWAYS be on the end of this list!! (period)
  };
  
-@@ -338,19 +358,20 @@ enum Commands {
+@@ -340,19 +360,20 @@ enum Commands {
   * This enums defines some flags which can be used for the commands.
   */
  enum DoCommandFlag {
@@ -5577,7 +5577,7 @@ index 359709e36..896ecd921 100644
  	}
  
 diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
-index 06534ad29..c9ee5661a 100644
+index d5959f5e1..82471510a 100644
 --- a/src/gfxinit.cpp
 +++ b/src/gfxinit.cpp
 @@ -193,6 +193,9 @@ static void LoadSpriteTables()
@@ -32587,7 +32587,7 @@ index 1aaf98434..2258d9a8e 100644
  
  #endif /* OBJECT_MAP_H */
 diff --git a/src/openttd.cpp b/src/openttd.cpp
-index 10c31e904..f423fe764 100644
+index dd48fb986..557235715 100644
 --- a/src/openttd.cpp
 +++ b/src/openttd.cpp
 @@ -57,6 +57,7 @@
@@ -40009,7 +40009,7 @@ index 4aff6b9d3..40431b3a2 100644
   * Tests if a specific slope has exactly three corners raised.
   *
 diff --git a/src/station.cpp b/src/station.cpp
-index 456262dea..593096cbc 100644
+index f86286f3d..c07fad14b 100644
 --- a/src/station.cpp
 +++ b/src/station.cpp
 @@ -24,6 +24,7 @@
@@ -40020,7 +40020,7 @@ index 456262dea..593096cbc 100644
  #include "linkgraph/linkgraph.h"
  #include "linkgraph/linkgraphschedule.h"
  
-@@ -132,6 +133,10 @@ Station::~Station()
+@@ -129,6 +130,10 @@ Station::~Station()
  		InvalidateWindowData(WC_STATION_LIST, this->owner, 0);
  	}
  
@@ -40031,7 +40031,7 @@ index 456262dea..593096cbc 100644
  	DeleteWindowById(WC_STATION_VIEW, index);
  
  	/* Now delete all orders that go to the station */
-@@ -147,6 +152,25 @@ Station::~Station()
+@@ -144,6 +149,25 @@ Station::~Station()
  	CargoPacket::InvalidateAllFrom(this->index);
  }
  
@@ -40057,7 +40057,7 @@ index 456262dea..593096cbc 100644
  
  /**
   * Invalidating of the JoinStation window has to be done
-@@ -227,6 +251,23 @@ void Station::MarkTilesDirty(bool cargo_change) const
+@@ -224,6 +248,23 @@ void Station::MarkTilesDirty(bool cargo_change) const
  	}
  }
  
@@ -40081,7 +40081,7 @@ index 456262dea..593096cbc 100644
  /* virtual */ uint Station::GetPlatformLength(TileIndex tile) const
  {
  	assert(this->TileBelongsToRailStation(tile));
-@@ -568,3 +609,88 @@ Money AirportMaintenanceCost(Owner owner)
+@@ -565,3 +606,88 @@ Money AirportMaintenanceCost(Owner owner)
  	/* 3 bits fraction for the maintenance cost factor. */
  	return total_cost >> 3;
  }
@@ -42385,10 +42385,10 @@ index 7ca9bd720..9dbc7bf49 100644
  /**
   * Make the given tile an oilrig tile.
 diff --git a/src/strings.cpp b/src/strings.cpp
-index fd7420259..84cb076f2 100644
+index e1e352f5d..1de66a7f5 100644
 --- a/src/strings.cpp
 +++ b/src/strings.cpp
-@@ -1150,6 +1150,8 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
+@@ -1152,6 +1152,8 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
  
  				const CargoSpec *cs;
  				FOR_ALL_SORTED_CARGOSPECS(cs) {
@@ -42397,7 +42397,7 @@ index fd7420259..84cb076f2 100644
  					if (!HasBit(cmask, cs->Index())) continue;
  
  					if (buff >= last - 2) break; // ',' and ' '
-@@ -1163,6 +1165,20 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
+@@ -1165,6 +1167,20 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
  					}
  
  					buff = GetStringWithArgs(buff, cs->name, args, last, next_substr_case_index, game_script);
@@ -46799,7 +46799,7 @@ index fc40f22a6..06c60d57a 100644
  	 * Marks the vehicles to be redrawn and updates cached variables
  	 *
 diff --git a/src/viewport.cpp b/src/viewport.cpp
-index df431ff3c..cde9a17ee 100644
+index 6de827b4e..3da7b000a 100644
 --- a/src/viewport.cpp
 +++ b/src/viewport.cpp
 @@ -41,19 +41,19 @@
@@ -46850,7 +46850,7 @@ index df431ff3c..cde9a17ee 100644
  #include "window_gui.h"
  #include "linkgraph/linkgraph_gui.h"
  #include "viewport_sprite_sorter.h"
-@@ -937,6 +940,32 @@ static void DrawTileSelectionRect(const TileInfo *ti, PaletteID pal)
+@@ -940,6 +943,32 @@ static void DrawTileSelectionRect(const TileInfo *ti, PaletteID pal)
  	DrawSelectionSprite(sel, pal, ti, 7, FOUNDATION_PART_NORMAL);
  }
  
@@ -46883,7 +46883,7 @@ index df431ff3c..cde9a17ee 100644
  static bool IsPartOfAutoLine(int px, int py)
  {
  	px -= _thd.selstart.x;
-@@ -1004,6 +1033,31 @@ static void DrawAutorailSelection(const TileInfo *ti, uint autorail_type)
+@@ -1007,6 +1036,31 @@ static void DrawAutorailSelection(const TileInfo *ti, uint autorail_type)
  	DrawSelectionSprite(image, _thd.make_square_red ? PALETTE_SEL_TILE_RED : pal, ti, 7, foundation_part);
  }
  
@@ -46915,7 +46915,7 @@ index df431ff3c..cde9a17ee 100644
  /**
   * Checks if the specified tile is selected and if so draws selection using correct selectionstyle.
   * @param *ti TileInfo Tile that is being drawn
-@@ -1029,22 +1083,11 @@ draw_inner:
+@@ -1032,22 +1086,11 @@ draw_inner:
  		if (_thd.drawstyle & HT_RECT) {
  			if (!is_redsq) DrawTileSelectionRect(ti, _thd.make_square_red ? PALETTE_SEL_TILE_RED : PAL_NONE);
  		} else if (_thd.drawstyle & HT_POINT) {
@@ -46942,7 +46942,7 @@ index df431ff3c..cde9a17ee 100644
  		} else if (_thd.drawstyle & HT_RAIL) {
  			/* autorail highlight piece under cursor */
  			HighLightStyle type = _thd.drawstyle & HT_DIR_MASK;
-@@ -1255,8 +1298,7 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
+@@ -1258,8 +1301,7 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
  	const Town *t;
  	FOR_ALL_TOWNS(t) {
  		ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &t->cache.sign,
@@ -46952,7 +46952,7 @@ index df431ff3c..cde9a17ee 100644
  				t->index, t->cache.population);
  	}
  }
-@@ -2153,7 +2195,7 @@ static void PlaceObject()
+@@ -2156,7 +2198,7 @@ static void PlaceObject()
  	pt = GetTileBelowCursor();
  	if (pt.x == -1) return;
  
@@ -46961,7 +46961,7 @@ index df431ff3c..cde9a17ee 100644
  		pt.x += TILE_SIZE / 2;
  		pt.y += TILE_SIZE / 2;
  	}
-@@ -2396,8 +2438,10 @@ void UpdateTileSelection()
+@@ -2399,8 +2441,10 @@ void UpdateTileSelection()
  					break;
  				case HT_POINT:
  					new_drawstyle = HT_POINT;
@@ -46974,7 +46974,7 @@ index df431ff3c..cde9a17ee 100644
  					break;
  				case HT_RAIL:
  					/* Draw one highlighted tile in any direction */
-@@ -3141,6 +3185,19 @@ EventState VpHandlePlaceSizingDrag()
+@@ -3144,6 +3188,19 @@ EventState VpHandlePlaceSizingDrag()
  	return ES_HANDLED;
  }
  
@@ -46994,7 +46994,7 @@ index df431ff3c..cde9a17ee 100644
  /**
   * Change the cursor and mouse click/drag handling to a mode for performing special operations like tile area selection, object placement, etc.
   * @param icon New shape of the mouse cursor.
-@@ -3225,6 +3282,14 @@ Point GetViewportStationMiddle(const ViewPort *vp, const Station *st)
+@@ -3228,6 +3285,14 @@ Point GetViewportStationMiddle(const ViewPort *vp, const Station *st)
  	return p;
  }
  
@@ -47115,7 +47115,7 @@ index cbd300dec..1a09e97f9 100644
  
  static WindowDesc _extra_view_port_desc(
 diff --git a/src/viewport_type.h b/src/viewport_type.h
-index 07485c324..bb171f794 100644
+index 74cd88d95..1169ed3ab 100644
 --- a/src/viewport_type.h
 +++ b/src/viewport_type.h
 @@ -121,6 +121,9 @@ enum ViewportDragDropSelectionProcess {
@@ -47127,7 +47127,7 @@ index 07485c324..bb171f794 100644
 +	DDSP_COPY_TO_CLIPBOARD,    ///< Copy area to clipboard
  };
  
- #endif /* VIEWPORT_TYPE_H */
+ 
 diff --git a/src/void_cmd.cpp b/src/void_cmd.cpp
 index ffe54df99..83a6760fc 100644
 --- a/src/void_cmd.cpp