mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-17 00:46:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'showVars' into 'master'

Browse source 
Show global script variables in showVars

See merge request OpenMW/openmw!4614
This commit is contained in:
psi29a 2025-07-03 07:11:23 +00:00
commit d40c4855b1
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,8 @@ namespace MWScript
void removeScript(const ESM::RefId& name);
const std::unordered_map<ESM::RefId, std::shared_ptr<GlobalScriptDesc>>& getScripts() const { return mScripts; }
bool isRunning(const ESM::RefId& name) const;
void run();

49
apps/openmw/mwscript/miscextensions.cpp
View file

@ -1192,6 +1192,10 @@ namespace MWScript
MWBase::World* world = MWBase::Environment::get().getWorld();
std::vector<std::string> names = runtime.getContext().getGlobals();
// sort for user convenience
std::sort(names.begin(), names.end());
for (size_t i = 0; i < names.size(); ++i)
{
char type = world->getGlobalVariableType(names[i]);
@ -1223,6 +1227,50 @@ namespace MWScript
runtime.getContext().report(str.str());
}
void printGlobalScriptsVars(Interpreter::Runtime& runtime)
{
std::stringstream str;
str << std::endl << "Global Scripts:";
const auto& scripts = MWBase::Environment::get().getScriptManager()->getGlobalScripts().getScripts();
// sort for user convenience
std::map<ESM::RefId, std::shared_ptr<GlobalScriptDesc>> globalScripts(scripts.begin(), scripts.end());
auto printVariables
= [&str](const ESM::RefId& scptName, const auto& names, const auto& values, std::string_view type) {
size_t size = std::min(names.size(), values.size());
for (size_t i = 0; i < size; ++i)
{
str << std::endl
<< " " << scptName << "->" << names[i] << " = " << values[i] << " (" << type << ")";
}
};
for (const auto& [refId, script] : globalScripts)
{
// Skip dormant global scripts
if (!script->mRunning)
continue;
const Compiler::Locals& complocals
= MWBase::Environment::get().getScriptManager()->getLocals(refId);
const Locals& locals
= MWBase::Environment::get().getScriptManager()->getGlobalScripts().getLocals(refId);
if (locals.isEmpty())
str << std::endl << " No variables in script " << refId;
else
{
printVariables(refId, complocals.get('s'), locals.mShorts, "short");
printVariables(refId, complocals.get('l'), locals.mLongs, "long");
printVariables(refId, complocals.get('f'), locals.mFloats, "float");
}
}
runtime.getContext().report(str.str());
}
public:
void execute(Interpreter::Runtime& runtime) override
{
@ -1233,6 +1281,7 @@ namespace MWScript
{
// No reference, no problem.
printGlobalVars(runtime);
printGlobalScriptsVars(runtime);
}
}
};