mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 15:36:42 +00:00
Code Issues Releases Wiki Activity

inherit variables

Browse source
This commit is contained in:
unknown 2020-07-29 18:43:56 +02:00
parent 72b63ed140
commit b39f35d805
3 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwscript/globalscripts.cpp
View file

@ -299,6 +299,15 @@ namespace MWScript
return iter->second->mLocals; return iter->second->mLocals;
} }
const Locals* GlobalScripts::getLocalsIfPresent (const std::string& name) const
{
std::string name2 = ::Misc::StringUtils::lowerCase (name);
auto iter = mScripts.find (name2);
if (iter==mScripts.end())
return nullptr;
return &iter->second->mLocals;
}
void GlobalScripts::updatePtrs(const MWWorld::Ptr& base, const MWWorld::Ptr& updated) void GlobalScripts::updatePtrs(const MWWorld::Ptr& base, const MWWorld::Ptr& updated)
{ {
MatchPtrVisitor visitor(base); MatchPtrVisitor visitor(base);

2
apps/openmw/mwscript/globalscripts.hpp
View file

@ -82,6 +82,8 @@ namespace MWScript
///< If the script \a name has not been added as a global script yet, it is added ///< If the script \a name has not been added as a global script yet, it is added
/// automatically, but is not set to running state. /// automatically, but is not set to running state.
const Locals* getLocalsIfPresent (const std::string& name) const;
void updatePtrs(const MWWorld::Ptr& base, const MWWorld::Ptr& updated); void updatePtrs(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);
///< Update the Ptrs stored in mTarget. Should be called after the reference has been moved to a new cell. ///< Update the Ptrs stored in mTarget. Should be called after the reference has been moved to a new cell.
}; };

27
apps/openmw/mwscript/locals.cpp
View file

@ -1,4 +1,5 @@
#include "locals.hpp" #include "locals.hpp"
#include "globalscripts.hpp"
#include <components/esm/loadscpt.hpp> #include <components/esm/loadscpt.hpp>
#include <components/esm/variant.hpp> #include <components/esm/variant.hpp>
@ -33,15 +34,25 @@ namespace MWScript
if (mInitialised) if (mInitialised)
return false; return false;
const Compiler::Locals& locals = const Locals* global = MWBase::Environment::get().getScriptManager()->getGlobalScripts().getLocalsIfPresent(script.mId);
MWBase::Environment::get().getScriptManager()->getLocals (script.mId); if(global)
{
mShorts = global->mShorts;
mLongs = global->mLongs;
mFloats = global->mFloats;
}
else
{
const Compiler::Locals& locals =
MWBase::Environment::get().getScriptManager()->getLocals (script.mId);
mShorts.clear(); mShorts.clear();
mShorts.resize (locals.get ('s').size(), 0); mShorts.resize (locals.get ('s').size(), 0);
mLongs.clear(); mLongs.clear();
mLongs.resize (locals.get ('l').size(), 0); mLongs.resize (locals.get ('l').size(), 0);
mFloats.clear(); mFloats.clear();
mFloats.resize (locals.get ('f').size(), 0); mFloats.resize (locals.get ('f').size(), 0);
}
mInitialised = true; mInitialised = true;
return true; return true;