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

Merge remote-tracking branch 'rohitnirmal/journal-open-sound'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-06-13 18:04:38 +02:00
commit df016778be
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,7 +183,7 @@ namespace
if (!MWBase::Environment::get().getWindowManager ()->getJournalAllowed ()) if (!MWBase::Environment::get().getWindowManager ()->getJournalAllowed ())
{ {
MWBase::Environment::get().getWindowManager()->popGuiMode (); MWBase::Environment::get().getWindowManager()->popGuiMode ();
} }
mModel->load (); mModel->load ();
setBookMode (); setBookMode ();
@ -213,6 +213,7 @@ namespace
void close() void close()
{ {
mModel->unload (); mModel->unload ();
getPage (LeftBookPage)->showPage (Book (), 0); getPage (LeftBookPage)->showPage (Book (), 0);
@ -432,8 +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().getSoundManager()->playSound ("book close", 1.0, 1.0);
MWBase::Environment::get().getWindowManager ()->popGuiMode (); MWBase::Environment::get().getWindowManager ()->popGuiMode ();
} }
@ -472,4 +472,4 @@ namespace
MWGui::JournalWindow * MWGui::JournalWindow::create (JournalViewModel::Ptr Model) MWGui::JournalWindow * MWGui::JournalWindow::create (JournalViewModel::Ptr Model)
{ {
return new JournalWindowImpl (Model); return new JournalWindowImpl (Model);
} }

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

@ -666,9 +666,9 @@ 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); 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)