(svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings

2011-03-05 18:00:48 +00:00
parent ec798d27df
commit 2e5b1f178e
14 changed files with 109 additions and 149 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -642,7 +642,7 @@ int ttd_main(int argc, char *argv[])
 	_screen.zoom = ZOOM_LVL_NORMAL;

 	/* restore saved music volume */
-	_music_driver->SetVolume(_msf.music_vol);
+	_music_driver->SetVolume(_settings_client.music.music_vol);

 	NetworkStartUp(); // initialize network-core