mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'glorf/bugfix-1'

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-04-08 20:23:18 +02:00
commit ef09b1cac8
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwgui/journalwindow.cpp
View File

@ -114,15 +114,9 @@ MWGui::JournalWindow::JournalWindow (MWBase::WindowManager& parWindowManager)
//displayLeftText(list.front()); //displayLeftText(list.front());
} }
void MWGui::JournalWindow::close()
{
MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
}
void MWGui::JournalWindow::open() void MWGui::JournalWindow::open()
{ {
mPageNumber = 0; mPageNumber = 0;
MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
if(MWBase::Environment::get().getJournal()->begin()!=MWBase::Environment::get().getJournal()->end()) if(MWBase::Environment::get().getJournal()->begin()!=MWBase::Environment::get().getJournal()->end())
{ {
book journal; book journal;

1
apps/openmw/mwgui/journalwindow.hpp
View File

@ -16,7 +16,6 @@ namespace MWGui
public: public:
JournalWindow(MWBase::WindowManager& parWindowManager); JournalWindow(MWBase::WindowManager& parWindowManager);
virtual void open(); virtual void open();
virtual void close();
private: private:
void displayLeftText(std::string text); void displayLeftText(std::string text);

6
apps/openmw/mwinput/inputmanagerimp.cpp
View File

@ -656,9 +656,15 @@ namespace MWInput
bool gameMode = !mWindows.isGuiMode(); bool gameMode = !mWindows.isGuiMode();
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.
} }