Merge branch 'cpp-11' into crashlog_improvements

# Conflicts: # config.lib
2017-09-04 01:22:54 +01:00
parent 2f85326a4a 509e20406f
commit 4a6ddb2d50
301 changed files with 6351 additions and 4178 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -361,7 +361,6 @@ static void LoadIntroGame(bool load_newgrfs = true)
 	_pause_mode = PM_UNPAUSED;
 	_cursor.fix_at = false;

-	if (load_newgrfs) CheckForMissingSprites();
 	CheckForMissingGlyphs();

 	/* Play main theme */