mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-13 05:51:46 +00:00
Code Issues Releases Wiki Activity

Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule

Browse source
This commit is contained in:
Jacob Essex 2011-11-09 23:12:10 +00:00
parent 9aac625000
commit 3779aaba62
1 changed files with 27 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
apps/openmw/engine.cpp
View file

@ -408,45 +408,36 @@ void OMW::Engine::go()
void OMW::Engine::activate() void OMW::Engine::activate()
{ {
// TODO: This is only a workaround. The input dispatcher should catch any exceptions thrown inside std::string handle = mEnvironment.mWorld->getFacedHandle();
// the input handling functions. Looks like this will require an OpenEngine modification.
try if (handle.empty())
return;
MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle);
if (ptr.isEmpty())
return;
MWScript::InterpreterContext interpreterContext (mEnvironment,
&ptr.getRefData().getLocals(), ptr);
boost::shared_ptr<MWWorld::Action> action =
MWWorld::Class::get (ptr).activate (ptr, mEnvironment.mWorld->getPlayer().getPlayer(),
mEnvironment);
interpreterContext.activate (ptr, action);
std::string script = MWWorld::Class::get (ptr).getScript (ptr);
if (!script.empty())
{ {
std::string handle = mEnvironment.mWorld->getFacedHandle(); mEnvironment.mWorld->getLocalScripts().setIgnore (ptr);
mScriptManager->run (script, interpreterContext);
if (handle.empty())
return;
MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle);
if (ptr.isEmpty())
return;
MWScript::InterpreterContext interpreterContext (mEnvironment,
&ptr.getRefData().getLocals(), ptr);
boost::shared_ptr<MWWorld::Action> action =
MWWorld::Class::get (ptr).activate (ptr, mEnvironment.mWorld->getPlayer().getPlayer(),
mEnvironment);
interpreterContext.activate (ptr, action);
std::string script = MWWorld::Class::get (ptr).getScript (ptr);
if (!script.empty())
{
mEnvironment.mWorld->getLocalScripts().setIgnore (ptr);
mScriptManager->run (script, interpreterContext);
}
if (!interpreterContext.hasActivationBeenHandled())
{
interpreterContext.executeActivation();
}
} }
catch (const std::exception& e)
if (!interpreterContext.hasActivationBeenHandled())
{ {
std::cerr << "Activation failed: " << e.what() << std::endl; interpreterContext.executeActivation();
} }
} }