mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 09:32:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'compile_no_evil' into 'master'

Browse Source 
Remove dead code

See merge request OpenMW/openmw!1327
This commit is contained in:
psi29a 2021-10-29 12:51:20 +00:00
commit b189282ba1
5 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/opencs/model/world/scriptcontext.cpp
View File

@ -102,11 +102,6 @@ bool CSMWorld::ScriptContext::isId (const std::string& name) const
return std::binary_search (mIds.begin(), mIds.end(), Misc::StringUtils::lowerCase (name));
}
bool CSMWorld::ScriptContext::isJournalId (const std::string& name) const
{
return mData.getJournals().searchId (name)!=-1;
}
void CSMWorld::ScriptContext::invalidateIds()
{
mIdsUpdated = false;

3
apps/opencs/model/world/scriptcontext.hpp
View File

@ -39,9 +39,6 @@ namespace CSMWorld
bool isId (const std::string& name) const override;
///< Does \a name match an ID, that can be referenced?
bool isJournalId (const std::string& name) const override;
///< Does \a name match a journal ID?
void invalidateIds();
void clear();

10
apps/openmw/mwscript/compilercontext.cpp
View File

@ -86,14 +86,4 @@ namespace MWScript
store.get<ESM::Weapon>().search (name) ||
store.get<ESM::Script>().search (name);
}
bool CompilerContext::isJournalId (const std::string& name) const
{
const MWWorld::ESMStore &store =
MWBase::Environment::get().getWorld()->getStore();
const ESM::Dialogue *topic = store.get<ESM::Dialogue>().search (name);
return topic && topic->mType==ESM::Dialogue::Journal;
}
}

3
apps/openmw/mwscript/compilercontext.hpp
View File

@ -39,9 +39,6 @@ namespace MWScript
bool isId (const std::string& name) const override;
///< Does \a name match an ID, that can be referenced?
bool isJournalId (const std::string& name) const override;
///< Does \a name match a journal ID?
};
}

3
components/compiler/context.hpp
View File

@ -42,9 +42,6 @@ namespace Compiler
virtual bool isId (const std::string& name) const = 0;
///< Does \a name match an ID, that can be referenced?
virtual bool isJournalId (const std::string& name) const = 0;
///< Does \a name match a journal ID?
};
}