mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-15 18:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'nocliffracerschooling' into 'master'

Browse Source 
Editor: Remove Training service for creatures

See merge request OpenMW/openmw!3396
This commit is contained in:
psi29a 2023-09-06 08:14:00 +00:00
commit 5a0a04684a
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/opencs/model/world/refidadapterimp.cpp
View File

@ -516,10 +516,18 @@ QVariant CSMWorld::CreatureRefIdAdapter::getData(const RefIdColumn* column, cons
if (column == mColumns.mBloodType)
return record.get().mBloodType;
std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
{
std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
if (iter != mColumns.mFlags.end())
return (record.get().mFlags & iter->second) != 0;
if (iter != mColumns.mFlags.end())
return (record.get().mFlags & iter->second) != 0;
}
{
std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mServices.find(column);
if (iter != mColumns.mServices.end() && iter->second == ESM::NPC::Training)
return QVariant();
}
return ActorRefIdAdapter<ESM::Creature>::getData(column, data, index);
}