summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBertram <bertram@cegetel.net>2009-10-29 23:07:11 +0100
committerBertram <bertram@cegetel.net>2009-10-29 23:07:11 +0100
commitf1c60e9a64bedb907bb8172c2927dc04aaeef6f0 (patch)
treea0ac288994900bb0efc20770c992a72bf8fb77a6 /src/main.cpp
parenta5943d58c2fd81cc24e06cc44b55852a217d7c62 (diff)
downloadmana-f1c60e9a64bedb907bb8172c2927dc04aaeef6f0.tar.gz
mana-f1c60e9a64bedb907bb8172c2927dc04aaeef6f0.tar.bz2
mana-f1c60e9a64bedb907bb8172c2927dc04aaeef6f0.tar.xz
mana-f1c60e9a64bedb907bb8172c2927dc04aaeef6f0.zip
Put back the music fade out after gameHandler->ingame(),
reverting what was made in main.cpp about it.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp14
1 files 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;