krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.

Browse source
This commit is contained in:
Rohit Nirmal 2013-06-09 23:27:47 -05:00
parent 48496a644f
commit 4eede86ce6
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwgui/journalwindow.cpp
View file

@ -184,6 +184,11 @@ namespace
{ {
MWBase::Environment::get().getWindowManager()->popGuiMode (); MWBase::Environment::get().getWindowManager()->popGuiMode ();
} }
else
{
// play opening sound only if the player has the journal
MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
}
mModel->load (); mModel->load ();
setBookMode (); setBookMode ();
@ -213,6 +218,7 @@ namespace
void close() void close()
{ {
MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
mModel->unload (); mModel->unload ();
getPage (LeftBookPage)->showPage (Book (), 0); getPage (LeftBookPage)->showPage (Book (), 0);
@ -432,8 +438,6 @@ namespace
void notifyClose(MyGUI::Widget* _sender) void notifyClose(MyGUI::Widget* _sender)
{ {
MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
MWBase::Environment::get().getWindowManager ()->popGuiMode (); MWBase::Environment::get().getWindowManager ()->popGuiMode ();
} }

3
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -658,12 +658,11 @@ namespace MWInput
if(gameMode) if(gameMode)
{ {
MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
mWindows.pushGuiMode(MWGui::GM_Journal); mWindows.pushGuiMode(MWGui::GM_Journal);
} }
else if(mWindows.getMode() == MWGui::GM_Journal) else if(mWindows.getMode() == MWGui::GM_Journal)
{ {
MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
mWindows.popGuiMode(); mWindows.popGuiMode();
} }
// .. but don't touch any other mode. // .. but don't touch any other mode.