summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/notifymanager.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp
index 130ee5702..aed5dd9f8 100644
--- a/src/notifymanager.cpp
+++ b/src/notifymanager.cpp
@@ -21,6 +21,8 @@
#include "notifymanager.h"
+#include "configuration.h"
+
#include "soundmanager.h"
#include "being/localplayer.h"
@@ -162,12 +164,21 @@ namespace NotifyManager
{
return;
}
+
+ soundManager.playSfx(SoundDB::getSound(message), 0, 0);
+
+ if (message == NotifyTypes::MONEY_GET &&
+ !config.getBoolValue("showpickupchat"))
+ {
+ return;
+ }
+
const NotificationInfo &info = notifications[message];
if (*info.text == 0)
{
- soundManager.playSfx(SoundDB::getSound(message), 0, 0);
return;
}
+
switch (info.flags)
{
case NotifyFlags::STRING:
@@ -199,7 +210,6 @@ namespace NotifyManager
default:
break;
}
- soundManager.playSfx(SoundDB::getSound(message), 0, 0);
}
int getIndexBySound(const std::string &sound)