mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-30 02:56:44 +00:00
Code Issues Releases Wiki Activity

added running flag; moved new game code to MWState

Browse source
This commit is contained in:
Marc Zinnschlag 2013-11-16 12:22:28 +01:00
parent 31ec973c9c
commit ec5b2e9a7e
5 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -488,6 +488,8 @@ void OMW::Engine::go()
// start in main menu
if (!mSkipMenu)
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
else
MWBase::Environment::get().getStateManager()->newGame (true);
// Start the main rendering loop
while (!mEnvironment.get().getStateManager()->hasQuitRequest())

7
apps/openmw/mwbase/statemanager.hpp
View file

@ -23,6 +23,13 @@ namespace MWBase
virtual void requestQuit() = 0;
virtual bool hasQuitRequest() const = 0;
virtual bool isGameRunning() const = 0;
virtual void newGame (bool bypass = false) = 0;
///< Start a new game.
///
/// \param bypass Skip new game mechanics.
};
}

5
apps/openmw/mwgui/mainmenu.cpp
View file

@ -81,10 +81,7 @@ namespace MWGui
MWBase::Environment::get().getStateManager()->requestQuit();
else if (sender == mButtons["newgame"])
{
MWBase::Environment::get().getWorld()->startNewGame();
MWBase::Environment::get().getWindowManager()->setNewGame(true);
MWBase::Environment::get().getDialogueManager()->clear();
MWBase::Environment::get().getJournal()->clear();
MWBase::Environment::get().getStateManager()->newGame();
}
else if (sender == mButtons["loadgame"])

32
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -1,8 +1,14 @@
#include "statemanagerimp.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/journal.hpp"
#include "../mwbase/dialoguemanager.hpp"
#include "../mwbase/windowmanager.hpp"
MWState::StateManager::StateManager()
: mQuitRequest (false)
: mQuitRequest (false), mRunning (false)
{
}
@ -16,3 +22,27 @@ bool MWState::StateManager::hasQuitRequest() const
{
return mQuitRequest;
}
bool MWState::StateManager::isGameRunning() const
{
return mRunning;
}
void MWState::StateManager::newGame (bool bypass)
{
if (mRunning)
{
MWBase::Environment::get().getDialogueManager()->clear();
MWBase::Environment::get().getJournal()->clear();
mRunning = false;
}
if (!bypass)
{
/// \todo extract cleanup code
MWBase::Environment::get().getWorld()->startNewGame();
MWBase::Environment::get().getWindowManager()->setNewGame (true);
}
mRunning = true;
}

8
apps/openmw/mwstate/statemanagerimp.hpp
View file

@ -8,6 +8,7 @@ namespace MWState
class StateManager : public MWBase::StateManager
{
bool mQuitRequest;
bool mRunning;
public:
@ -16,6 +17,13 @@ namespace MWState
virtual void requestQuit();
virtual bool hasQuitRequest() const;
virtual bool isGameRunning() const;
virtual void newGame (bool bypass = false);
///< Start a new game.
///
/// \param bypass Skip new game mechanics.
};
}