krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix getDistance not detecting references in inactive cells properly

Browse source
This commit is contained in:
scrawl 2014-06-16 16:34:00 +02:00
parent 47bd170d7e
commit 2ce8323a42
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -378,12 +378,20 @@ namespace MWScript
float InterpreterContext::getDistance (const std::string& name, const std::string& id) const float InterpreterContext::getDistance (const std::string& name, const std::string& id) const
{ {
const MWWorld::Ptr ref2 = getReference (id, false, false); // NOTE: id may be empty, indicating an implicit reference
MWWorld::Ptr ref2;
if (id.empty())
ref2 = getReference("", true, true);
else
ref2 = MWBase::Environment::get().getWorld()->searchPtr(id, true);
// If either actor is in a non-active cell, return a large value (just like vanilla) // If either actor is in a non-active cell, return a large value (just like vanilla)
if (ref2.isEmpty()) if (ref2.isEmpty())
return std::numeric_limits<float>().max(); return std::numeric_limits<float>().max();
const MWWorld::Ptr ref = getReference (name, false, false); const MWWorld::Ptr ref = MWBase::Environment::get().getWorld()->searchPtr(name, true);
if (ref.isEmpty()) if (ref.isEmpty())
return std::numeric_limits<float>().max(); return std::numeric_limits<float>().max();

1
apps/openmw/mwscript/interpretercontext.hpp
View file

@ -118,6 +118,7 @@ namespace MWScript
virtual void stopScript (const std::string& name); virtual void stopScript (const std::string& name);
virtual float getDistance (const std::string& name, const std::string& id = "") const; virtual float getDistance (const std::string& name, const std::string& id = "") const;
///< @note if \a id is empty, assumes an implicit reference
bool hasBeenActivated (const MWWorld::Ptr& ptr); bool hasBeenActivated (const MWWorld::Ptr& ptr);
///< \attention Calling this function for the right reference will mark the action as ///< \attention Calling this function for the right reference will mark the action as