Merge branch 'tracerestrict' into tracerestrict-sx

# Conflicts: # src/saveload/saveload.cpp
2017-01-17 19:23:33 +00:00
parent 15787545a0 f5e4d8e73a
commit 82152d8605
169 changed files with 3264 additions and 2515 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -360,7 +360,6 @@ static void LoadIntroGame(bool load_newgrfs = true)
 	_pause_mode = PM_UNPAUSED;
 	_cursor.fix_at = false;

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

 	/* Play main theme */