From f1c60e9a64bedb907bb8172c2927dc04aaeef6f0 Mon Sep 17 00:00:00 2001 From: Bertram Date: Thu, 29 Oct 2009 23:07:11 +0100 Subject: Put back the music fade out after gameHandler->ingame(), reverting what was made in main.cpp about it. --- src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f2d61f07..994ccc62 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1104,13 +1104,6 @@ int main(int argc, char *argv[]) case STATE_CONNECT_GAME: logger->log("State: CONNECT GAME"); - // Allow any alpha opacity - SkinLoader::instance()->setMinimumOpacity(-1.0f); - - // Fade out logon-music here too to give the desired effect - // of "flowing" into the game. - sound.fadeOutMusic(1000); - Net::getGameHandler()->connect(); currentDialog = new ConnectionDialog(STATE_SWITCH_CHARACTER); break; @@ -1122,6 +1115,13 @@ int main(int argc, char *argv[]) Net::getGameHandler()->inGame(); + // Fade out logon-music here too to give the desired effect + // of "flowing" into the game. + sound.fadeOutMusic(1000); + + // Allow any alpha opacity + SkinLoader::instance()->setMinimumOpacity(-1.0f); + delete setupButton; delete desktop; setupButton = NULL; -- cgit v1.2.3-70-g09d2