diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-02-18 22:47:30 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-02-18 23:24:03 +0100 |
| commit | 20afba1adc84dd0e859605250c5a44a111045c2b (patch) | |
| tree | 304f34e96403215a8e1d9a3cf880a6a28f5a4721 /src/gui/gui.cpp | |
| parent | 6fd1246735010bccd0d75e9e7969431b963b7858 (diff) | |
| download | mana-20afba1adc84dd0e859605250c5a44a111045c2b.tar.gz mana-20afba1adc84dd0e859605250c5a44a111045c2b.tar.bz2 mana-20afba1adc84dd0e859605250c5a44a111045c2b.tar.xz mana-20afba1adc84dd0e859605250c5a44a111045c2b.zip | |
Added notification sound on receiving whisper
One of the sound channels is reserved for notification sounds, of which the
volume can be configured separately. Currently, the only notification sound
that is played is for receiving whispers. That can be extended later.
The newmessage.ogg sound used currently is the one for receiving a message
with the Psi instant messenger.
Parts of this patch are based on the new message notification in ManaPlus.
Reviewed-by: Erik Schilling
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 2f24d009..78fc42fb 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -29,6 +29,7 @@ #include "gui/widgets/window.h" #include "gui/widgets/windowcontainer.h" +#include "client.h" #include "configuration.h" #include "eventlistener.h" #include "graphics.h" @@ -204,7 +205,7 @@ void Gui::draw() int mouseX, mouseY; Uint8 button = SDL_GetMouseState(&mouseX, &mouseY); - if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1)) + if ((Client::hasMouseFocus() || button & SDL_BUTTON(1)) && mCustomCursor && mMouseCursorAlpha > 0.0f) { |