Merge branch 'master' into jgrpp

CMakeLists.txt

@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(OpenTTD)
+if (NOT BINARY_NAME)
+    set(BINARY_NAME openttd)
+endif (NOT BINARY_NAME)
+
+project(${BINARY_NAME})
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds not allowed. Please run \"cmake ..\" from the bin directory")
@@ -146,6 +150,7 @@ include(CompileFlags)
 compile_flags()
 
 add_executable(openttd WIN32 ${GENERATED_SOURCE_FILES})
+set_target_properties(openttd PROPERTIES OUTPUT_NAME "${BINARY_NAME}")
 # All other files are added via target_sources()
 
 set(host_tools_list strgen settingsgen)

cmake/CompileFlags.cmake

@@ -23,6 +23,9 @@ macro(compile_flags)
         # C++11 standard". We need C++11 for the way we use threads.
         add_compile_options(/Zc:rvalueCast)
 
+        # Enable multi-threaded compilation.
+        add_compile_options(/MP)
+
         # Add DPI manifest to project; other WIN32 targets get this via ottdres.rc
         list(APPEND GENERATED_SOURCE_FILES "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest")
     endif (MSVC)

cmake/InstallAndPackage.cmake

@@ -3,7 +3,7 @@ include(GNUInstallDirs)
 # If requested, use FHS layout; otherwise fall back to a flat layout.
 if (OPTION_INSTALL_FHS)
     set(BINARY_DESTINATION_DIR "${CMAKE_INSTALL_BINDIR}")
-    set(DATA_DESTINATION_DIR "${CMAKE_INSTALL_DATADIR}/openttd")
+    set(DATA_DESTINATION_DIR "${CMAKE_INSTALL_DATADIR}/${BINARY_NAME}")
     set(DOCS_DESTINATION_DIR "${CMAKE_INSTALL_DOCDIR}")
     set(MAN_DESTINATION_DIR "${CMAKE_INSTALL_MANDIR}")
 else (OPTION_INSTALL_FHS)
@@ -41,8 +41,16 @@ install(FILES
 # A Linux manual only makes sense when using FHS. Otherwise it is a very odd
 # file with little context to what it is.
 if (OPTION_INSTALL_FHS)
+    set(MAN_SOURCE_FILE ${CMAKE_SOURCE_DIR}/docs/openttd.6)
+    set(MAN_BINARY_FILE ${CMAKE_BINARY_DIR}/docs/${BINARY_NAME}.6)
+    install(CODE
+            "
+                execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${MAN_SOURCE_FILE} ${MAN_BINARY_FILE})
+                execute_process(COMMAND gzip -9 -f ${MAN_BINARY_FILE})
+            "
+            COMPONENT manual)
     install(FILES
-                    ${CMAKE_SOURCE_DIR}/docs/openttd.6
+                    ${MAN_BINARY_FILE}.gz
             DESTINATION ${MAN_DESTINATION_DIR}/man6
             COMPONENT manual)
 endif (OPTION_INSTALL_FHS)

cmake/Options.cmake

@@ -14,9 +14,9 @@ function(set_directory_options)
         set(DEFAULT_SHARED_DIR "(not set)")
         set(DEFAULT_GLOBAL_DIR "(not set)")
     elseif (UNIX)
-        set(DEFAULT_PERSONAL_DIR ".openttd")
+        set(DEFAULT_PERSONAL_DIR ".${BINARY_NAME}")
         set(DEFAULT_SHARED_DIR "(not set)")
-        set(DEFAULT_GLOBAL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/openttd")
+        set(DEFAULT_GLOBAL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${BINARY_NAME}")
     else ()
         message(FATAL_ERROR "Unknown OS found; please consider creating a Pull Request to add support for this OS.")
     endif ()
@@ -51,7 +51,7 @@ function(set_options)
     option(OPTION_FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
 
     option(OPTION_DEDICATED "Build dedicated server only (no GUI)" OFF)
-    option(OPTION_INSTALL_FHS "Install with Filesstem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS})
+    option(OPTION_INSTALL_FHS "Install with Filesystem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS})
     option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON)
     option(OPTION_USE_THREADS "Use threads" ON)
     option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" OFF)

src/company_gui.cpp

@@ -1894,7 +1894,7 @@ struct CompanyInfrastructureWindow : Window
 
 		switch (widget) {
 			case WID_CI_RAIL_DESC: {
-				uint lines = 1;
+				uint lines = 1; // Starts at 1 because a line is also required for the section title
 
 				size->width = max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT).width);
 
@@ -1917,7 +1917,7 @@ struct CompanyInfrastructureWindow : Window
 
 			case WID_CI_ROAD_DESC:
 			case WID_CI_TRAM_DESC: {
-				uint lines = 0;
+				uint lines = 1; // Starts at 1 because a line is also required for the section title
 
 				size->width = max(size->width, GetStringBoundingBox(widget == WID_CI_ROAD_DESC ? STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT : STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT).width);
 

src/core/endian_type.hpp

@@ -12,10 +12,10 @@
 
 #if defined(ARM) || defined(__arm__) || defined(__alpha__)
 	/** The architecture requires aligned access. */
-	#define OTTD_ALIGNMENT 1
+#	define OTTD_ALIGNMENT 1
 #else
 	/** The architecture does not require aligned access. */
-	#define OTTD_ALIGNMENT 0
+#	define OTTD_ALIGNMENT 0
 #endif
 
 /** Little endian builds use this for TTD_ENDIAN. */

src/core/geometry_type.hpp

@@ -12,8 +12,8 @@
 
 #if defined(__APPLE__)
 	/* Mac OS X already has both Rect and Point declared */
-	#define Rect OTTD_Rect
+#	define Rect OTTD_Rect
-	#define Point OTTD_Point
+#	define Point OTTD_Point
 #endif /* __APPLE__ */
 
 

src/core/random_func.hpp

@@ -14,7 +14,7 @@
 
 #if defined(__APPLE__)
 	/* Apple already has Random declared */
-	#define Random OTTD_Random
+#	define Random OTTD_Random
 #endif /* __APPLE__ */
 
 /**
@@ -75,13 +75,13 @@ public:
 
 void SetRandomSeed(uint32 seed);
 #ifdef RANDOM_DEBUG
-	#ifdef __APPLE__
+#	ifdef __APPLE__
-		#define OTTD_Random() DoRandom(__LINE__, __FILE__)
+#		define OTTD_Random() DoRandom(__LINE__, __FILE__)
-	#else
+#	else
-		#define Random() DoRandom(__LINE__, __FILE__)
+#		define Random() DoRandom(__LINE__, __FILE__)
-	#endif
+#	endif
 	uint32 DoRandom(int line, const char *file);
-	#define RandomRange(limit) DoRandomRange(limit, __LINE__, __FILE__)
+#	define RandomRange(limit) DoRandomRange(limit, __LINE__, __FILE__)
 	uint32 DoRandomRange(uint32 limit, int line, const char *file);
 #else
 	static inline uint32 Random()
@@ -144,7 +144,7 @@ static inline bool Chance16I(const uint a, const uint b, const uint32 r)
  * @return True with (a/b) probability
  */
 #ifdef RANDOM_DEBUG
-	#define Chance16(a, b) Chance16I(a, b, DoRandom(__LINE__, __FILE__))
+#	define Chance16(a, b) Chance16I(a, b, DoRandom(__LINE__, __FILE__))
 #else
 static inline bool Chance16(const uint a, const uint b)
 {
@@ -168,7 +168,7 @@ static inline bool Chance16(const uint a, const uint b)
  * @return True in (a/b) percent
  */
 #ifdef RANDOM_DEBUG
-	#define Chance16R(a, b, r) (r = DoRandom(__LINE__, __FILE__), Chance16I(a, b, r))
+#	define Chance16R(a, b, r) (r = DoRandom(__LINE__, __FILE__), Chance16I(a, b, r))
 #else
 static inline bool Chance16R(const uint a, const uint b, uint32 &r)
 {

src/ini.cpp

@@ -90,7 +90,7 @@ bool IniFile::SaveToDisk(const char *filename)
 
 #if defined(_WIN32)
 	/* _tcsncpy = strcpy is TCHAR is char, but isn't when TCHAR is wchar. */
-	#undef strncpy
+#	undef strncpy
 	/* Allocate space for one more \0 character. */
 	TCHAR tfilename[MAX_PATH + 1], tfile_new[MAX_PATH + 1];
 	_tcsncpy(tfilename, OTTD2FS(filename), MAX_PATH);

src/landscape.cpp

@@ -1197,8 +1197,8 @@ static void BuildRiver(TileIndex begin, TileIndex end)
  */
 static bool FlowRiver(TileIndex spring, TileIndex begin)
 {
-	#define SET_MARK(x) marks.insert(x)
+#	define SET_MARK(x) marks.insert(x)
-	#define IS_MARKED(x) (marks.find(x) != marks.end())
+#	define IS_MARKED(x) (marks.find(x) != marks.end())
 
 	uint height = TileHeight(begin);
 	if (IsWaterTile(begin)) return DistanceManhattan(spring, begin) > _settings_game.game_creation.min_river_length;

src/lang/czech.txt

@@ -1021,6 +1021,7 @@ STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexické peso (
 STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nový taiwanský dolar (NTD)
 STR_GAME_OPTIONS_CURRENCY_CNY                                   :Čínský renminbi (CNY)
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkongský dolar (HKD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indická rupie (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Silniční vozidla jezdí
@@ -2251,6 +2252,7 @@ STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Špatné
 STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Server je plný
 STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Jsi blokován serverem
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Byl jsi vyhozen ze hry
+STR_NETWORK_ERROR_KICK_MESSAGE                                  :{WHITE}Důvod: {STRING}
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Používání cheatů není na tomto serveru povoleno
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Posíláte serveru příliš mnoho příkazů
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Vložení hesla ti trvalo příliš dlouho
@@ -2310,6 +2312,7 @@ STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} po
 STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dal(a) jsi {1:STRING} {2:CURRENCY_LONG}
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Server ukončil relaci
 STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Server se restartuje...{}Počkejte prosím...
+STR_NETWORK_MESSAGE_KICKED                                      :*** {STRING} byl vyhozen. Důvod: ({STRING})
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Součásti ke stažení

src/map_func.h

@@ -255,11 +255,11 @@ static inline TileIndexDiff ToTileIndexDiff(TileIndexDiffC tidc)
 	 * @param y Another tile to add
 	 * @return The resulting tile(index)
 	 */
-	#define TILE_ADD(x, y) ((x) + (y))
+#	define TILE_ADD(x, y) ((x) + (y))
 #else
 	extern TileIndex TileAdd(TileIndex tile, TileIndexDiff add,
 		const char *exp, const char *file, int line);
-	#define TILE_ADD(x, y) (TileAdd((x), (y), #x " + " #y, __FILE__, __LINE__))
+#	define TILE_ADD(x, y) (TileAdd((x), (y), #x " + " #y, __FILE__, __LINE__))
 #endif
 
 /**

src/misc/binaryheap.hpp

@@ -17,10 +17,10 @@
 
 #if BINARYHEAP_CHECK
 	/** Check for consistency. */
-	#define CHECK_CONSISTY() this->CheckConsistency()
+#	define CHECK_CONSISTY() this->CheckConsistency()
 #else
 	/** Don't check for consistency. */
-	#define CHECK_CONSISTY() ;
+#	define CHECK_CONSISTY() ;
 #endif
 
 /**

src/music/dmusic.cpp

@@ -10,7 +10,7 @@
 #define INITGUID
 #include "../stdafx.h"
 #ifdef WIN32_LEAN_AND_MEAN
-	#undef WIN32_LEAN_AND_MEAN // Don't exclude rarely-used stuff from Windows headers
+#	undef WIN32_LEAN_AND_MEAN // Don't exclude rarely-used stuff from Windows headers
 #endif
 #include "../debug.h"
 #include "../os/windows/win32.h"

src/os/os2/os2.cpp

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <time.h>
 #ifndef __INNOTEK_LIBC__
-	#include <dos.h>
+#	include <dos.h>
 #endif
 
 #include "../../safeguards.h"
@@ -36,7 +36,7 @@
 
 #include <os2.h>
 #ifndef __INNOTEK_LIBC__
-	#include <i86.h>
+#	include <i86.h>
 #endif
 
 bool FiosIsRoot(const char *file)

src/os/unix/unix.cpp

@@ -29,13 +29,13 @@
 #endif
 
 #ifdef __APPLE__
-	#include <sys/mount.h>
+#	include <sys/mount.h>
 #elif (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) || defined(__GLIBC__)
-	#define HAS_STATVFS
+#	define HAS_STATVFS
 #endif
 
 #if defined(OPENBSD) || defined(__NetBSD__) || defined(__FreeBSD__)
-	#define HAS_SYSCTL
+#	define HAS_SYSCTL
 #endif
 
 #ifdef HAS_STATVFS

src/stdafx.h

@@ -18,14 +18,14 @@
 #endif
 
 #if defined(__APPLE__)
-	#include "os/macosx/osx_stdafx.h"
+#	include "os/macosx/osx_stdafx.h"
 #endif /* __APPLE__ */
 
 #if defined(__HAIKU__)
-	#include <SupportDefs.h>
+#	include <SupportDefs.h>
-	#include <unistd.h>
+#	include <unistd.h>
-	#define _GNU_SOURCE
+#	define _GNU_SOURCE
-	#define TROUBLED_INTS
+#	define TROUBLED_INTS
 #endif
 
 #if defined(__HAIKU__) || defined(__CYGWIN__)
@@ -37,52 +37,52 @@
  * does not have stdint.h.
  * For OSX the inclusion is already done in osx_stdafx.h. */
 #if !defined(__APPLE__) && (!defined(_MSC_VER) || _MSC_VER >= 1600)
-	#if defined(SUNOS)
+#	if defined(SUNOS)
 		/* SunOS/Solaris does not have stdint.h, but inttypes.h defines everything
 		 * stdint.h defines and we need. */
-		#include <inttypes.h>
+#		include <inttypes.h>
-	#else
+#	else
-		#define __STDC_LIMIT_MACROS
+#		define __STDC_LIMIT_MACROS
-		#include <stdint.h>
+#		include <stdint.h>
-	#endif
+#	endif
 #endif
 
 /* The conditions for these constants to be available are way too messy; so check them one by one */
 #if !defined(UINT64_MAX)
-	#define UINT64_MAX (18446744073709551615ULL)
+#	define UINT64_MAX (18446744073709551615ULL)
 #endif
 #if !defined(INT64_MAX)
-	#define INT64_MAX  (9223372036854775807LL)
+#	define INT64_MAX  (9223372036854775807LL)
 #endif
 #if !defined(INT64_MIN)
-	#define INT64_MIN  (-INT64_MAX - 1)
+#	define INT64_MIN  (-INT64_MAX - 1)
 #endif
 #if !defined(UINT32_MAX)
-	#define UINT32_MAX (4294967295U)
+#	define UINT32_MAX (4294967295U)
 #endif
 #if !defined(INT32_MAX)
-	#define INT32_MAX  (2147483647)
+#	define INT32_MAX  (2147483647)
 #endif
 #if !defined(INT32_MIN)
-	#define INT32_MIN  (-INT32_MAX - 1)
+#	define INT32_MIN  (-INT32_MAX - 1)
 #endif
 #if !defined(UINT16_MAX)
-	#define UINT16_MAX (65535U)
+#	define UINT16_MAX (65535U)
 #endif
 #if !defined(INT16_MAX)
-	#define INT16_MAX  (32767)
+#	define INT16_MAX  (32767)
 #endif
 #if !defined(INT16_MIN)
-	#define INT16_MIN  (-INT16_MAX - 1)
+#	define INT16_MIN  (-INT16_MAX - 1)
 #endif
 #if !defined(UINT8_MAX)
-	#define UINT8_MAX  (255)
+#	define UINT8_MAX  (255)
 #endif
 #if !defined(INT8_MAX)
-	#define INT8_MAX   (127)
+#	define INT8_MAX   (127)
 #endif
 #if !defined(INT8_MIN)
-	#define INT8_MIN   (-INT8_MAX - 1)
+#	define INT8_MIN   (-INT8_MAX - 1)
 #endif
 
 #include <cstdio>
@@ -94,20 +94,20 @@
 #include <memory>
 
 #ifndef SIZE_MAX
-	#define SIZE_MAX ((size_t)-1)
+#	define SIZE_MAX ((size_t)-1)
 #endif
 
 #if defined(UNIX) || defined(__MINGW32__)
-	#include <sys/types.h>
+#	include <sys/types.h>
 #endif
 
 #if defined(__OS2__)
-	#include <types.h>
+#	include <types.h>
-	#define strcasecmp stricmp
+#	define strcasecmp stricmp
 #endif
 
 #if defined(SUNOS) || defined(HPUX) || defined(__CYGWIN__)
-	#include <alloca.h>
+#	include <alloca.h>
 #endif
 
 /* Stuff for GCC */
@@ -133,33 +133,33 @@
 #endif /* __GNUC__ || __clang__ */
 
 #if defined(__WATCOMC__)
-	#define NORETURN
+#	define NORETURN
-	#define CDECL
+#	define CDECL
-	#define WARN_FORMAT(string, args)
+#	define WARN_FORMAT(string, args)
-	#define FINAL
+#	define FINAL
-	#define FALLTHROUGH
+#	define FALLTHROUGH
-	#include <malloc.h>
+#	include <malloc.h>
 #endif /* __WATCOMC__ */
 
 #if defined(__MINGW32__)
-	#include <malloc.h> // alloca()
+#	include <malloc.h> // alloca()
 #endif
 
 #if defined(_WIN32)
-	#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
+#	define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
 #endif
 
 /* Stuff for MSVC */
 #if defined(_MSC_VER)
-	#pragma once
+#	pragma once
-	#ifdef _WIN64
+#	ifdef _WIN64
 		/* No 64-bit Windows below XP, so we can safely assume it as the target platform. */
-		#define NTDDI_VERSION NTDDI_WINXP // Windows XP
+#		define NTDDI_VERSION NTDDI_WINXP // Windows XP
-		#define _WIN32_WINNT 0x501        // Windows XP
+#		define _WIN32_WINNT 0x501        // Windows XP
-		#define _WIN32_WINDOWS 0x501      // Windows XP
+#		define _WIN32_WINDOWS 0x501      // Windows XP
-		#define WINVER 0x0501             // Windows XP
+#		define WINVER 0x0501             // Windows XP
-		#define _WIN32_IE_ 0x0600         // 6.0 (XP+)
+#		define _WIN32_IE_ 0x0600         // 6.0 (XP+)
-	#else
+#	else
 		/* Define a win32 target platform, to override defaults of the SDK
 		 * We need to define NTDDI version for Vista SDK, but win2k is minimum */
 		#define NTDDI_VERSION NTDDI_WIN2K // Windows 2000
@@ -207,23 +207,23 @@
 #	endif
 
 	/* fallthrough attribute, VS 2017 */
-	#if (_MSC_VER >= 1910)
+#	if (_MSC_VER >= 1910)
-		#define FALLTHROUGH [[fallthrough]]
+#		define FALLTHROUGH [[fallthrough]]
-	#else
+#	else
-		#define FALLTHROUGH
+#		define FALLTHROUGH
-	#endif
+#	endif
 
 #	if defined(_WIN32) && !defined(_WIN64)
-		#if !defined(_W64)
+#		if !defined(_W64)
-			#define _W64
+#			define _W64
-		#endif
+#		endif
 
 		typedef _W64 int INT_PTR, *PINT_PTR;
 		typedef _W64 unsigned int UINT_PTR, *PUINT_PTR;
 #	endif /* _WIN32 && !_WIN64 */
 
 #	if defined(_WIN64)
-		#define fseek _fseeki64
+#		define fseek _fseeki64
 #	endif /* _WIN64 */
 
 	/* zlib from vcpkg use cdecl calling convention without enforcing it in the headers */
@@ -247,13 +247,13 @@
 #		endif
 #	endif
 
-	#define strcasecmp stricmp
+#	define strcasecmp stricmp
-	#define strncasecmp strnicmp
+#	define strncasecmp strnicmp
-	#define strtoull _strtoui64
+#	define strtoull _strtoui64
 
 	/* MSVC doesn't have these :( */
-	#define S_ISDIR(mode) (mode & S_IFDIR)
+#	define S_ISDIR(mode) (mode & S_IFDIR)
-	#define S_ISREG(mode) (mode & S_IFREG)
+#	define S_ISREG(mode) (mode & S_IFREG)
 
 #endif /* defined(_MSC_VER) */
 
@@ -262,28 +262,28 @@
 #if !defined(STRGEN) && !defined(SETTINGSGEN)
 #	if defined(_WIN32)
 		char *getcwd(char *buf, size_t size);
-		#include <tchar.h>
+#		include <tchar.h>
-		#include <io.h>
+#		include <io.h>
 
 		namespace std { using ::_tfopen; }
-		#define fopen(file, mode) _tfopen(OTTD2FS(file), _T(mode))
+#		define fopen(file, mode) _tfopen(OTTD2FS(file), _T(mode))
-		#define unlink(file) _tunlink(OTTD2FS(file))
+#		define unlink(file) _tunlink(OTTD2FS(file))
 
 		const char *FS2OTTD(const TCHAR *name);
 		const TCHAR *OTTD2FS(const char *name, bool console_cp = false);
 #	else
-		#define fopen(file, mode) fopen(OTTD2FS(file), mode)
+#		define fopen(file, mode) fopen(OTTD2FS(file), mode)
 		const char *FS2OTTD(const char *name);
 		const char *OTTD2FS(const char *name);
 #	endif /* _WIN32 */
 #endif /* STRGEN || SETTINGSGEN */
 
 #if defined(_WIN32) || defined(__OS2__) && !defined(__INNOTEK_LIBC__)
-	#define PATHSEP "\\"
+#	define PATHSEP "\\"
-	#define PATHSEPCHAR '\\'
+#	define PATHSEPCHAR '\\'
 #else
-	#define PATHSEP "/"
+#	define PATHSEP "/"
-	#define PATHSEPCHAR '/'
+#	define PATHSEPCHAR '/'
 #endif
 
 #if defined(_MSC_VER) || defined(__WATCOMC__)
@@ -343,7 +343,7 @@ typedef unsigned char byte;
 #endif /* !TROUBLED_INTS */
 
 #if !defined(WITH_PERSONAL_DIR)
-	#define PERSONAL_DIR ""
+#	define PERSONAL_DIR ""
 #endif
 
 #define assert_compile(expr) static_assert(expr, #expr )
@@ -389,7 +389,7 @@ assert_compile(SIZE_MAX >= UINT32_MAX);
 
 #define cpp_offsetof(s, m)   (((size_t)&reinterpret_cast<const volatile char&>((((s*)(char*)8)->m))) - 8)
 #if !defined(offsetof)
-	#define offsetof(s, m) cpp_offsetof(s, m)
+#	define offsetof(s, m) cpp_offsetof(s, m)
 #endif /* offsetof */
 
 /**
@@ -411,9 +411,9 @@ assert_compile(SIZE_MAX >= UINT32_MAX);
 
 /* take care of some name clashes on MacOS */
 #if defined(__APPLE__)
-	#define GetString OTTD_GetString
+#	define GetString OTTD_GetString
-	#define DrawString OTTD_DrawString
+#	define DrawString OTTD_DrawString
-	#define CloseConnection OTTD_CloseConnection
+#	define CloseConnection OTTD_CloseConnection
 #endif /* __APPLE__ */
 
 #if defined(__GNUC__) || defined(__clang__)
@@ -460,17 +460,17 @@ const char *assert_tile_info(uint32 tile);
 
 #if defined(OPENBSD)
 	/* OpenBSD uses strcasecmp(3) */
-	#define _stricmp strcasecmp
+#	define _stricmp strcasecmp
 #endif
 
 #if defined(MAX_PATH)
 	/* It's already defined, no need to override */
 #elif defined(PATH_MAX) && PATH_MAX > 0
 	/* Use the value from PATH_MAX, if it exists */
-	#define MAX_PATH PATH_MAX
+#	define MAX_PATH PATH_MAX
 #else
 	/* If all else fails, hardcode something :( */
-	#define MAX_PATH 260
+#	define MAX_PATH 260
 #endif
 
 /**
@@ -489,24 +489,24 @@ static inline void free(const void *ptr)
 #define MAX_UVALUE(type) ((type)~(type)0)
 
 #if defined(_MSC_VER) && !defined(_DEBUG)
-	#define IGNORE_UNINITIALIZED_WARNING_START __pragma(warning(push)) __pragma(warning(disable:4700))
+#	define IGNORE_UNINITIALIZED_WARNING_START __pragma(warning(push)) __pragma(warning(disable:4700))
-	#define IGNORE_UNINITIALIZED_WARNING_STOP __pragma(warning(pop))
+#	define IGNORE_UNINITIALIZED_WARNING_STOP __pragma(warning(pop))
 #elif defined(__GNUC__) && !defined(_DEBUG)
-	#define HELPER0(x) #x
+#	define HELPER0(x) #x
-	#define HELPER1(x) HELPER0(GCC diagnostic ignored x)
+#	define HELPER1(x) HELPER0(GCC diagnostic ignored x)
-	#define HELPER2(y) HELPER1(#y)
+#	define HELPER2(y) HELPER1(#y)
 #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-	#define IGNORE_UNINITIALIZED_WARNING_START \
+#	define IGNORE_UNINITIALIZED_WARNING_START \
 		_Pragma("GCC diagnostic push") \
 		_Pragma(HELPER2(-Wuninitialized)) \
 		_Pragma(HELPER2(-Wmaybe-uninitialized))
-	#define IGNORE_UNINITIALIZED_WARNING_STOP _Pragma("GCC diagnostic pop")
+#	define IGNORE_UNINITIALIZED_WARNING_STOP _Pragma("GCC diagnostic pop")
 #endif
 #endif
 
 #ifndef IGNORE_UNINITIALIZED_WARNING_START
-	#define IGNORE_UNINITIALIZED_WARNING_START
+#	define IGNORE_UNINITIALIZED_WARNING_START
-	#define IGNORE_UNINITIALIZED_WARNING_STOP
+#	define IGNORE_UNINITIALIZED_WARNING_STOP
 #endif
 
 /*

src/viewport_sprite_sorter_sse4.cpp

@@ -20,7 +20,7 @@ assert_compile((sizeof(ParentSpriteToDraw) % 16) == 0);
 #ifdef _SQ64
 	#define LOAD_128 _mm_load_si128
 #else
-	#define LOAD_128 _mm_loadu_si128
+#	define LOAD_128 _mm_loadu_si128
 #endif
 
 /** Sort parent sprites pointer array using SSE4.1 optimizations. */