Merge branch 'master' into cpp-11

# Conflicts: # src/stdafx.h
2017-08-15 18:44:17 +01:00
parent 4e9d4dd80a a47fb85cd8
commit f3a0aace0c
287 changed files with 5603 additions and 3985 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -358,7 +358,6 @@ static void LoadIntroGame(bool load_newgrfs = true)
 	_pause_mode = PM_UNPAUSED;
 	_cursor.fix_at = false;

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

 	/* Play main theme */