mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 00:35:23 +00:00
Code Issues Projects Releases Wiki Activity

Make getdistance return maximum value only if the given objects are in different worldspaces (Fixes #1895)

Browse Source
This commit is contained in:
MiroslavR 2014-09-10 01:40:33 +02:00
parent 45c90bdcb5
commit 621e81fa7d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/openmw/mwscript/interpretercontext.cpp
View File

@ -18,6 +18,7 @@
#include "../mwbase/inputmanager.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwmechanics/npcstats.hpp"
@ -429,14 +430,13 @@ namespace MWScript
if (id.empty())
ref2 = getReferenceImp();
else
ref2 = MWBase::Environment::get().getWorld()->searchPtr(id, true);
ref2 = MWBase::Environment::get().getWorld()->getPtr(id, false);
// If either actor is in a non-active cell, return a large value (just like vanilla)
if (ref2.isEmpty())
return std::numeric_limits<float>().max();
const MWWorld::Ptr ref = MWBase::Environment::get().getWorld()->getPtr(name, false);
const MWWorld::Ptr ref = MWBase::Environment::get().getWorld()->searchPtr(name, true);
if (ref.isEmpty())
// If the objects are in different worldspaces, return a large value (just like vanilla)
if (ref.getCell()->isExterior() ^ ref2.getCell()->isExterior()
|| (!ref.getCell()->isExterior() && !ref2.getCell()->isExterior() && ref.getCell() != ref2.getCell()))
return std::numeric_limits<float>().max();
double diff[3];