diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-05-04 22:36:24 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-05-04 22:36:24 +0200 |
commit | d541170c0258217efdb02a4eb2303ddda1c9e774 (patch) | |
tree | 1d8bb571cb40642726d5d8b72af391099c6852bf | |
parent | 315d07f03ad557223906c2becf9a0f12e00e2bcb (diff) | |
download | mana-d541170c0258217efdb02a4eb2303ddda1c9e774.tar.gz mana-d541170c0258217efdb02a4eb2303ddda1c9e774.tar.bz2 mana-d541170c0258217efdb02a4eb2303ddda1c9e774.tar.xz mana-d541170c0258217efdb02a4eb2303ddda1c9e774.zip |
Avoid mixing the system login music with the existing song in TMW.
Reviewed-by: CodyMartin.
-rw-r--r-- | data/music/system/Magick - Real.ogg (renamed from data/music/Magick - Real.ogg) | bin | 1829108 -> 1829108 bytes | |||
-rw-r--r-- | src/client.cpp | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/data/music/Magick - Real.ogg b/data/music/system/Magick - Real.ogg Binary files differindex 0b43709d..0b43709d 100644 --- a/data/music/Magick - Real.ogg +++ b/data/music/system/Magick - Real.ogg diff --git a/src/client.cpp b/src/client.cpp index 9c5bdde7..f2d3222f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -393,7 +393,8 @@ Client::Client(const Options &options): userPalette = new UserPalette; setupWindow = new Setup; - sound.playMusic(branding.getValue("loginMusic", "Magick - Real.ogg")); + sound.playMusic(branding.getValue("loginMusic", + "music/system/Magick - Real.ogg")); // Initialize default server mCurrentServer.hostname = options.serverName; |