mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 19:45:33 +00:00
Code Issues Releases Wiki Activity

made engine framelistener more crash-resistant

Browse source
This commit is contained in:
Marc Zinnschlag 2010-09-18 08:39:21 +02:00
parent be8f852663
commit 7cd40fc7e4
1 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
apps/openmw/engine.cpp
View file

@ -56,47 +56,54 @@ void OMW::Engine::executeLocalScripts()
bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt) bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
{ {
mEnvironment.mFrameDuration = evt.timeSinceLastFrame; try
// global scripts
mEnvironment.mGlobalScripts->run (mEnvironment);
bool changed = mEnvironment.mWorld->hasCellChanged();
// local scripts
executeLocalScripts(); // This does not handle the case where a global script causes a cell
// change, followed by a cell change in a local script during the same
// frame.
// passing of time
if (mEnvironment.mWindowManager->getMode()==MWGui::GM_Game)
mEnvironment.mWorld->advanceTime (
mEnvironment.mFrameDuration*mEnvironment.mWorld->getTimeScaleFactor()/3600);
if (changed) // keep change flag for another frame, if cell changed happend in local script
mEnvironment.mWorld->markCellAsUnchanged();
// update actors
mEnvironment.mMechanicsManager->update();
if (focusFrameCounter++ == focusUpdateFrame)
{ {
std::string handle = mEnvironment.mWorld->getFacedHandle(); mEnvironment.mFrameDuration = evt.timeSinceLastFrame;
std::string name; // global scripts
mEnvironment.mGlobalScripts->run (mEnvironment);
if (!handle.empty()) bool changed = mEnvironment.mWorld->hasCellChanged();
// local scripts
executeLocalScripts(); // This does not handle the case where a global script causes a cell
// change, followed by a cell change in a local script during the same
// frame.
// passing of time
if (mEnvironment.mWindowManager->getMode()==MWGui::GM_Game)
mEnvironment.mWorld->advanceTime (
mEnvironment.mFrameDuration*mEnvironment.mWorld->getTimeScaleFactor()/3600);
if (changed) // keep change flag for another frame, if cell changed happend in local script
mEnvironment.mWorld->markCellAsUnchanged();
// update actors
mEnvironment.mMechanicsManager->update();
if (focusFrameCounter++ == focusUpdateFrame)
{ {
MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle); std::string handle = mEnvironment.mWorld->getFacedHandle();
if (!ptr.isEmpty()) std::string name;
name = MWWorld::Class::get (ptr).getName (ptr);
if (!handle.empty())
{
MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle);
if (!ptr.isEmpty())
name = MWWorld::Class::get (ptr).getName (ptr);
}
if (!name.empty())
std::cout << "Object: " << name << std::endl;
focusFrameCounter = 0;
} }
}
if (!name.empty()) catch (const std::exception& e)
std::cout << "Object: " << name << std::endl; {
std::cerr << "Error in framelistener: " << e.what() << std::endl;
focusFrameCounter = 0;
} }
return true; return true;