From d541170c0258217efdb02a4eb2303ddda1c9e774 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Wed, 4 May 2011 22:36:24 +0200 Subject: Avoid mixing the system login music with the existing song in TMW. Reviewed-by: CodyMartin. --- data/music/Magick - Real.ogg | Bin 1829108 -> 0 bytes data/music/system/Magick - Real.ogg | Bin 0 -> 1829108 bytes src/client.cpp | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 data/music/Magick - Real.ogg create mode 100644 data/music/system/Magick - Real.ogg diff --git a/data/music/Magick - Real.ogg b/data/music/Magick - Real.ogg deleted file mode 100644 index 0b43709d..00000000 Binary files a/data/music/Magick - Real.ogg and /dev/null differ diff --git a/data/music/system/Magick - Real.ogg b/data/music/system/Magick - Real.ogg new file mode 100644 index 00000000..0b43709d Binary files /dev/null and b/data/music/system/Magick - Real.ogg differ 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; -- cgit v1.2.3-70-g09d2