aboutsummaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorkwolekr <mirrorisim@gmail.com>2013-02-23 15:58:00 -0800
committerkwolekr <mirrorisim@gmail.com>2013-02-23 15:58:00 -0800
commit6b9906687b85fcefa28df572d92a3dea3118c0a3 (patch)
tree8fe4dd06fa56c9ea82eb7c442d25354399745364 /src/game.cpp
parentbc2e9dbaf2fe31a1aa8282c0ac7c87aee490c75c (diff)
parent4d73d99ebc848e2065b38672e882f994a1d561f4 (diff)
downloaddragonfireclient-6b9906687b85fcefa28df572d92a3dea3118c0a3.tar.xz
Merge pull request #503 from RealBadAngel/master
Add sound volume controls to ingame menu
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index c77754b5f..86909ccf0 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "server.h"
#include "guiPauseMenu.h"
#include "guiPasswordChange.h"
+#include "guiVolumeChange.h"
#include "guiFormSpecMenu.h"
#include "guiTextInputMenu.h"
#include "guiDeathScreen.h"
@@ -1519,6 +1520,13 @@ void the_game(
g_gamecallback->changepassword_requested = false;
}
+ if(g_gamecallback->changevolume_requested)
+ {
+ (new GUIVolumeChange(guienv, guiroot, -1,
+ &g_menumgr, &client))->drop();
+ g_gamecallback->changevolume_requested = false;
+ }
+
/* Process TextureSource's queue */
tsrc->processQueue();