summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Friis <peavey@inspircd.org>2009-05-19 12:52:45 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-28 22:11:56 +0200
commitd052dbe8646f1d4a80ca543435aeb9afe44321da (patch)
tree94818c0ee291995d3f42620d8c8cb70fcde95456
parent5b6c0dc4b070a4572e0cf37d25dc31092eac76d0 (diff)
downloadmana-d052dbe8646f1d4a80ca543435aeb9afe44321da.tar.gz
mana-d052dbe8646f1d4a80ca543435aeb9afe44321da.tar.bz2
mana-d052dbe8646f1d4a80ca543435aeb9afe44321da.tar.xz
mana-d052dbe8646f1d4a80ca543435aeb9afe44321da.zip
Fade out logon music just before initial map change.
(cherry picked from commit 0938ec96619016c44a8185634246c0384c62815b)
-rw-r--r--src/game.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 59c57607..82750dac 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -39,6 +39,7 @@
#include "npc.h"
#include "particle.h"
#include "playerrelations.h"
+#include "sound.h"
#include "gui/widgets/chattab.h"
#include "gui/buy.h"
@@ -320,6 +321,9 @@ Game::Game():
joystick = new Joystick(0);
#ifdef EATHENA_SUPPORT
+ // fade out logon-music here too to give the desired effect of "flowing"
+ // into the game.
+ sound.fadeOutMusic(1000);
map_path = map_path.substr(0, map_path.rfind("."));
engine->changeMap(map_path);
#endif