mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'safecomplete' into 'master'

Browse Source 
Only autocomplete string refids

See merge request OpenMW/openmw!2904
This commit is contained in:
psi29a 2023-04-08 15:12:56 +00:00
commit 7d86a56d22
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/openmw/mwgui/console.cpp
View File

@ -107,22 +107,27 @@ namespace MWGui
scanner.listKeywords(mNames);
// identifier
const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
std::vector<ESM::RefId> ids;
for (MWWorld::ESMStore::iterator it = store.begin(); it != store.end(); ++it)
for (const auto* store : esmStore)
{
(*it)->listIdentifier(ids);
store->listIdentifier(ids);
for (auto id : ids)
{
mNames.push_back(id.getRefIdString());
visit(
[&](auto&& variant) {
using T = std::decay_t<decltype(variant)>;
if constexpr (std::is_same_v<T, ESM::StringRefId>)
mNames.push_back(id.getRefIdString());
},
id);
}
ids.clear();
}
// exterior cell names aren't technically identifiers, but since the COC function accepts them,
// we should list them too
for (MWWorld::Store<ESM::Cell>::iterator it = store.get<ESM::Cell>().extBegin();
it != store.get<ESM::Cell>().extEnd(); ++it)
for (auto it = esmStore.get<ESM::Cell>().extBegin(); it != esmStore.get<ESM::Cell>().extEnd(); ++it)
{
if (!it->mName.empty())
mNames.push_back(it->mName);