diff options
author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
---|---|---|
committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/net/ea/gui | |
parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
download | plus-490862919d79369112c75955a9c36ff8a081efd3.tar.gz plus-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 plus-490862919d79369112c75955a9c36ff8a081efd3.tar.xz plus-490862919d79369112c75955a9c36ff8a081efd3.zip |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/net/ea/gui')
-rw-r--r-- | src/net/ea/gui/guildtab.cpp | 6 | ||||
-rw-r--r-- | src/net/ea/gui/guildtab.h | 2 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.cpp | 5 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.h | 2 |
4 files changed, 15 insertions, 0 deletions
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 87fc34d94..bd1521b21 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -26,6 +26,7 @@ #include "commandhandler.h" #include "guild.h" #include "localplayer.h" +#include "sound.h" #include "gui/theme.h" @@ -151,4 +152,9 @@ void GuildTab::saveToLogFile(std::string &msg) chatLogger->log("#Guild", msg); } +void GuildTab::playNewMessageSound() +{ + sound.playGuiSound(SOUND_GUILD); +} + } // namespace Ea diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index 81d971161..22a41ce80 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -47,6 +47,8 @@ class GuildTab : public ChatTab int getType() const { return ChatTab::TAB_GUILD; } + void playNewMessageSound(); + protected: void handleInput(const std::string &msg); diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index d5e344ac2..e69207842 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -26,6 +26,7 @@ #include "commandhandler.h" #include "localplayer.h" #include "party.h" +#include "sound.h" #include "gui/theme.h" @@ -241,4 +242,8 @@ void PartyTab::saveToLogFile(std::string &msg) chatLogger->log("#Party", msg); } +void PartyTab::playNewMessageSound() +{ + sound.playGuiSound(SOUND_GUILD); +} } // namespace Ea diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 029d71ac7..931b283dd 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -47,6 +47,8 @@ class PartyTab : public ChatTab void saveToLogFile(std::string &msg); + void playNewMessageSound(); + protected: void handleInput(const std::string &msg); |