michicc

diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 54c01e145..d69f8c1ba 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -129,9 +129,10 @@ uint8 VideoDriver_Win32Base::GetFullscreenBpp()
 /**
  * Instantiate a new window.
  * @param full_screen Whether to make a full screen window or not.
+ * @param resize Whether to change window size.
  * @return True if the window could be created.

michicc

diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp
index e466e506d..7075803cc 100644
--- a/src/video/opengl.cpp
+++ b/src/video/opengl.cpp
@@ -536,6 +536,10 @@ const char *OpenGLBackend::Init()

        DEBUG(driver, 1, "OpenGL driver: %s - %s (%s)", vend, renderer, ver);

+       /* Don't use MESA software rendering backends as they are slower than
+        * just using a non-OpenGL video driver. */

michicc

diff --git a/src/settings.cpp b/src/settings.cpp
index d3be59692..ffd0ebcdc 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -86,7 +86,7 @@ typedef std::list<ErrorMessageData> ErrorList;
 static ErrorList _settings_error_list; ///< Errors while loading minimal settings.
 
 
-typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, const char *grpname, void *object);
+typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, const char *grpname, void *object, bool only_minimal);

michicc

diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm
index 8a43945f5..a455ccb76 100644
--- a/src/video/cocoa/event.mm
+++ b/src/video/cocoa/event.mm
@@ -619,10 +619,6 @@ static bool QZ_PollEvent()
 
 void VideoDriver_Cocoa::GameLoop()
 {
-	uint32 cur_ticks = GetTick();
-	uint32 last_cur_ticks = cur_ticks;

michicc

diff --git a/cmake/scripts/Regression.cmake b/cmake/scripts/Regression.cmake
index 0b4e522d3..926457839 100644
--- a/cmake/scripts/Regression.cmake
+++ b/cmake/scripts/Regression.cmake
@@ -68,6 +68,10 @@ file(READ ai/${REGRESSION_TEST}/result.txt REGRESSION_EXPECTED)
 string(REPLACE "\n" ";" REGRESSION_RESULT "${REGRESSION_RESULT}")
 string(REPLACE "\n" ";" REGRESSION_EXPECTED "${REGRESSION_EXPECTED}")

+# Strip possible trailing newline
+string(REGEX REPLACE ";$" "" REGRESSION_RESULT "${REGRESSION_RESULT}")

michicc

/**
 * Simply using AIList of indexes is faster than any squirrel implementation.
 */
class Native_Heap
{
	_queue = null;
	_sorter = null;

	constructor()
	{

michicc

diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm
index bd5d8bdaa..c2c35fe78 100644
--- a/src/video/cocoa/wnd_quartz.mm
+++ b/src/video/cocoa/wnd_quartz.mm
@@ -289,9 +289,7 @@ - (void)drawRect:(NSRect)invalidRect
 							styleMask:style
 							backing:NSBackingStoreBuffered
 							defer:NO ];
-		if ([ this->window respondsToSelector:@selector(setColorSpace:) ]) {
-			[ this->window setColorSpace:[ [ [ NSColorSpace alloc ] initWithCGColorSpace:QZ_GetCorrectColorSpace() ] autorelease ] ];

michicc

diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
index 66974da28f..04d5951a25 100644
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -24,6 +24,7 @@
     <RootNamespace>openttd</RootNamespace>
     <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
     <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
+    <DisableAsserts>0</DisableAsserts>
   </PropertyGroup>

michicc

diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 3756a7452..86526a3bc 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -719,6 +724,7 @@ class Win32FontCache : public TrueTypeFontCache {
 	HFONT font = NULL;  ///< The font face associated with this font.
 	HDC dc = NULL;
 	HGDIOBJ old_font;
+	SIZE glyph_size;
 

michicc

From 58b42eaa40c6ec8a242ba64054f50c31d62a9e3e Mon Sep 17 00:00:00 2001
From: Michael Lutz <[email protected]>
Date: Sat, 28 Jul 2018 18:07:41 +0200
Subject: Feature: Railtype flags to allow/disallow 90 degree curves.

---
 src/pathfinder/follow_track.hpp |  2 +-
 src/pathfinder/npf/npf.cpp      | 14 +++++++++-----
 src/pbs.cpp                     |  4 ++--
 src/rail.h                      | 25 +++++++++++++++++++++++++