Merge branch 'save_ext' into enhanced_viewport_overlay

# Conflicts: # src/smallmap_gui.cpp
2017-09-04 01:04:04 +01:00
parent d3a1e8060d 19e62d089f
commit 2574e46df8
265 changed files with 4275 additions and 2654 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -375,7 +375,6 @@ static void LoadIntroGame(bool load_newgrfs = true)
 	_pause_mode = PM_UNPAUSED;
 	_cursor.fix_at = false;

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

 	/* Play main theme */