Merge branch 'master' into save_ext

# Conflicts: # src/saveload/saveload.cpp # src/table/settings.h.preamble
2018-07-02 18:41:39 +01:00
parent a3156804c5 8f278b3405
commit 373ff3dd4e
171 changed files with 3349 additions and 1011 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -373,8 +373,7 @@ static void LoadIntroGame(bool load_newgrfs = true)

 	CheckForMissingGlyphs();

-	/* Play main theme */
-	if (MusicDriver::GetInstance()->IsSongPlaying()) ResetMusic();
+	MusicLoop(); // ensure music is correct
 }

 void MakeNewgameSettingsLive()