From c85d939d9b3f6c10288dc86ffa7811408e349657 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 28 Feb 2012 02:14:15 +0300
Subject: Add different sound effects for different events. Can be configured
 in audio tab in settings.

---
 src/net/ea/charserverhandler.cpp  | 4 ++--
 src/net/ea/gamehandler.cpp        | 2 +-
 src/net/ea/playerhandler.cpp      | 7 +++----
 src/net/manaserv/beinghandler.cpp | 3 ++-
 src/net/manaserv/charhandler.cpp  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 2dc51acf3..67894b0d9 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -167,7 +167,7 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg)
             errorMessage = _("Incorrect race.");
             break;
     }
-    new OkDialog(_("Error"), errorMessage);
+    new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
     if (mCharCreateDialog)
         mCharCreateDialog->unlock();
 }
@@ -185,7 +185,7 @@ void CharServerHandler::processCharDelete(Net::MessageIn &msg A_UNUSED)
 void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg A_UNUSED)
 {
     unlockCharSelectDialog();
-    new OkDialog(_("Error"), _("Failed to delete character."));
+    new OkDialog(_("Error"), _("Failed to delete character."), DIALOG_ERROR);
 }
 
 void CharServerHandler::clear()
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 6d021d6a9..c8c870dbd 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -101,7 +101,7 @@ void GameHandler::processCharSwitchResponse(Net::MessageIn &msg)
 void GameHandler::processMapQuitResponse(Net::MessageIn &msg)
 {
     if (msg.readInt8())
-        new OkDialog(_("Game"), _("Request to quit denied!"), nullptr);
+        new OkDialog(_("Game"), _("Request to quit denied!"), DIALOG_ERROR);
 }
 
 } // namespace Ea
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 27aa4da80..ddcf7d9c0 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -336,7 +336,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
                     weightNotice = new OkDialog(_("Message"),
                         _("You are carrying more than "
                         "half your weight. You are "
-                        "unable to regain health."), false);
+                        "unable to regain health."), DIALOG_ERROR, false);
                     weightNotice->addActionListener(
                         &weightListener);
                 }
@@ -346,7 +346,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
                     weightNotice = new OkDialog(_("Message"),
                         _("You are carrying less than "
                         "half your weight. You "
-                        "can regain health."), false);
+                        "can regain health."), DIALOG_ERROR, false);
                     weightNotice->addActionListener(
                         &weightListener);
                 }
@@ -426,8 +426,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
     if (PlayerInfo::getAttribute(HP) == 0 && !deathNotice)
     {
         deathNotice = new OkDialog(_("Message"),
-                                    randomDeathMessage(),
-                                    false);
+            randomDeathMessage(), false);
         deathNotice->addActionListener(&deathListener);
         player_node->setAction(Being::DEAD);
     }
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index cef4f497a..9468baaa1 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -335,7 +335,8 @@ void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
         };
         std::string message(deadMsg[rand() % 13]);
         message.append(std::string(" ") + _("Press OK to respawn."));
-        OkDialog *dlg = new OkDialog(_("You Died"), message, false);
+        OkDialog *dlg = new OkDialog(_("You Died"),
+            message, DIALOG_OK, false);
         dlg->addActionListener(&(ManaServ::respawnListener));
     }
 }
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index 300af5a2b..7977df909 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -181,7 +181,7 @@ void CharHandler::handleCharacterCreateResponse(Net::MessageIn &msg)
                 errorMessage = _("Unknown error.");
                 break;
         }
-        new OkDialog(_("Error"), errorMessage);
+        new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
 
         if (mCharCreateDialog)
             mCharCreateDialog->unlock();
@@ -224,7 +224,7 @@ void CharHandler::handleCharacterDeleteResponse(Net::MessageIn &msg)
             default:
                 errorMessage = strprintf(_("Unknown error (%d)."), errMsg);
         }
-        new OkDialog(_("Error"), errorMessage);
+        new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
     }
     mSelectedCharacter = 0;
     unlockCharSelectDialog();
-- 
cgit v1.2.3-60-g2f50