mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-04 16:15:35 +00:00
Merge remote branch 'zini/newchar' into gui-windows
This commit is contained in:
commit
cf20233d7e
1 changed files with 42 additions and 35 deletions
|
@ -55,6 +55,8 @@ void OMW::Engine::executeLocalScripts()
|
|||
}
|
||||
|
||||
bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
|
||||
{
|
||||
try
|
||||
{
|
||||
mEnvironment.mFrameDuration = evt.timeSinceLastFrame;
|
||||
|
||||
|
@ -98,6 +100,11 @@ bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
|
|||
|
||||
focusFrameCounter = 0;
|
||||
}
|
||||
}
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
std::cerr << "Error in framelistener: " << e.what() << std::endl;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue