Merge branch 'master' into save_ext

2017-02-02 20:41:48 +00:00
parent 56f173e15e 0fc88ade9f
commit 3b45419a16
94 changed files with 665 additions and 613 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -371,7 +371,6 @@ static void LoadIntroGame(bool load_newgrfs = true)
 	_pause_mode = PM_UNPAUSED;
 	_cursor.fix_at = false;

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

 	/* Play main theme */