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

Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.

Browse source
This commit is contained in:
Rohit Nirmal 2013-06-10 19:42:38 -05:00
parent 4eede86ce6
commit b5caa25e5c
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -184,11 +184,6 @@ 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 ();
@ -218,7 +213,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);
@ -438,6 +433,7 @@ 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 ();
} }

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

@ -656,13 +656,14 @@ namespace MWInput
// Toggle between game mode and journal mode // Toggle between game mode and journal mode
bool gameMode = !mWindows.isGuiMode(); bool gameMode = !mWindows.isGuiMode();
if(gameMode) if(gameMode && MWBase::Environment::get().getWindowManager ()->getJournalAllowed())
{ {
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.