mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-04 03:40:14 +00:00
Merge branch 'rm_environment_cleanup' into 'master'
Remove Environment cleanup See merge request OpenMW/openmw!1846
This commit is contained in:
commit
4bd2f20979
@ -468,8 +468,6 @@ OMW::Engine::~Engine()
|
||||
|
||||
mStereoManager = nullptr;
|
||||
|
||||
mEnvironment.cleanup();
|
||||
|
||||
mMechanicsManager = nullptr;
|
||||
mDialogueManager = nullptr;
|
||||
mJournal = nullptr;
|
||||
|
@ -28,21 +28,6 @@ MWBase::Environment::~Environment()
|
||||
sThis = nullptr;
|
||||
}
|
||||
|
||||
void MWBase::Environment::cleanup()
|
||||
{
|
||||
mMechanicsManager = nullptr;
|
||||
mDialogueManager = nullptr;
|
||||
mJournal = nullptr;
|
||||
mScriptManager = nullptr;
|
||||
mWindowManager = nullptr;
|
||||
mWorld = nullptr;
|
||||
mSoundManager = nullptr;
|
||||
mInputManager = nullptr;
|
||||
mStateManager = nullptr;
|
||||
mLuaManager = nullptr;
|
||||
mResourceSystem = nullptr;
|
||||
}
|
||||
|
||||
void MWBase::Environment::reportStats(unsigned int frameNumber, osg::Stats& stats) const
|
||||
{
|
||||
mMechanicsManager->reportStats(frameNumber, stats);
|
||||
|
@ -112,8 +112,6 @@ namespace MWBase
|
||||
|
||||
void setFrameDuration(float value) { mFrameDuration = value; }
|
||||
|
||||
void cleanup();
|
||||
|
||||
/// Return instance of this class.
|
||||
static const Environment& get()
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user