From bbf5743dd18e78298376da6f78c71ae2a524c766 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 28 Feb 2012 22:16:23 +0300
Subject: Fix some sound event. Replace hardcoded sound names to constants. Add
 party/guild sound.

---
 src/gui/widgets/chattab.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/gui/widgets/chattab.cpp')

diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 53842e887..be6a31164 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -289,9 +289,19 @@ void ChatTab::chatLog(std::string line, Own own,
             if (getFlash() == 0)
             {
                 if (chatWindow && chatWindow->findHighlight(tmp.text))
+                {
                     setFlash(2);
+                    sound.playGuiSound(SOUND_HIGHLIGHT);
+                }
                 else
+                {
                     setFlash(1);
+                }
+            }
+            else if (getFlash() == 2)
+            {
+                if (chatWindow && chatWindow->findHighlight(tmp.text))
+                    sound.playGuiSound(SOUND_HIGHLIGHT);
             }
         }
 
@@ -300,8 +310,10 @@ void ChatTab::chatLog(std::string line, Own own,
             || (Client::getIsMinimized() || (!Client::getMouseFocused()
             && !Client::getInputFocused()))))
         {
-            if (own != BY_SERVER)
-                sound.playGuiSound("soundwhisper");
+            if (own == BY_GM)
+                sound.playGuiSound(SOUND_GLOBAL);
+            else if (own != BY_SERVER)
+                playNewMessageSound();
         }
     }
 }
@@ -468,3 +480,8 @@ void ChatTab::addNewRow(std::string &line)
     }
     mScrollArea->logic();
 }
+
+void ChatTab::playNewMessageSound()
+{
+    sound.playGuiSound(SOUND_WHISPER);
+}
-- 
cgit v1.2.3-70-g09d2