Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini

src/video/cocoa/cocoa_ogl.h

@@ -50,7 +50,7 @@ protected:
 	void *GetVideoPointer() override;
 	void ReleaseVideoPointer() override;
 
-	NSView* AllocateDrawView() override;
+	NSView *AllocateDrawView() override;
 };
 
 class FVideoDriver_CocoaOpenGL : public DriverFactoryBase {

src/video/cocoa/cocoa_v.h

@@ -78,7 +78,7 @@ protected:
 
 	bool MakeWindow(int width, int height);
 
-	virtual NSView* AllocateDrawView() = 0;
+	virtual NSView *AllocateDrawView() = 0;
 
 	/** Get a pointer to the video buffer. */
 	virtual void *GetVideoPointer() = 0;
@@ -121,7 +121,7 @@ protected:
 	void Paint() override;
 	void CheckPaletteAnim() override;
 
-	NSView* AllocateDrawView() override;
+	NSView *AllocateDrawView() override;
 
 	void *GetVideoPointer() override { return this->buffer_depth == 8 ? this->pixel_buffer : this->window_buffer; }
 };

src/video/cocoa/cocoa_v.mm

@@ -399,7 +399,7 @@ bool VideoDriver_Cocoa::MakeWindow(int width, int height)
 		behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
 		[ this->window setCollectionBehavior:behavior ];
 
-		NSButton* fullscreenButton = [ this->window standardWindowButton:NSWindowZoomButton ];
+		NSButton *fullscreenButton = [ this->window standardWindowButton:NSWindowZoomButton ];
 		[ fullscreenButton setAction:@selector(toggleFullScreen:) ];
 		[ fullscreenButton setTarget:this->window ];
 	}