summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Friis <peavey@inspircd.org>2009-05-28 22:57:42 +0200
committerDennis Friis <peavey@inspircd.org>2009-05-28 22:57:42 +0200
commit14d2898184aa12d9c1af8b2c53d1486a878813f2 (patch)
treef6b18deaf0f071dd3f5cde16b1244c5ad6b62917 /src
parenta558eaffb2fa37c5ae2598c08a12fd3c2b6aa3ec (diff)
downloadmana-14d2898184aa12d9c1af8b2c53d1486a878813f2.tar.gz
mana-14d2898184aa12d9c1af8b2c53d1486a878813f2.tar.bz2
mana-14d2898184aa12d9c1af8b2c53d1486a878813f2.tar.xz
mana-14d2898184aa12d9c1af8b2c53d1486a878813f2.zip
Revert "Start playing map music if on a map when turning sound on."
This reverts commit ef3ca81ed1b59e4700db38768d7dc8c00b819cf0.
Diffstat (limited to 'src')
-rw-r--r--src/gui/setup_audio.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 476d7b9a..9da74c2e 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -28,8 +28,6 @@
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/slider.h"
-#include "engine.h"
-#include "map.h"
#include "configuration.h"
#include "log.h"
#include "sound.h"
@@ -90,9 +88,6 @@ void Setup_Audio::apply()
try
{
sound.init();
- Map *currentMap = engine->getCurrentMap();
- if (currentMap)
- sound.playMusic(currentMap->getProperty("music"));
}
catch (const char *err)
{