2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 15:07:43 +00:00

General: Make use of explicit constructors where applicable

Gets rid of potential error prone implicitly constructing constructors.
This commit is contained in:
Lioncash
2020-03-25 21:25:11 -04:00
parent f4b3fb947e
commit 241a66dc0a
50 changed files with 117 additions and 111 deletions

View File

@@ -61,11 +61,13 @@ void CScriptTrigger::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CS
CScriptTrigger::CObjectTracker* CScriptTrigger::FindObject(TUniqueId id) {
auto& inhabitants = GetInhabitants();
const auto& iter = std::find(inhabitants.begin(), inhabitants.end(), id);
const auto iter = std::find(inhabitants.begin(), inhabitants.end(), CObjectTracker{id});
if (iter != inhabitants.end())
return &(*iter);
return nullptr;
if (iter == inhabitants.end()) {
return nullptr;
}
return &*iter;
}
void CScriptTrigger::UpdateInhabitants(float dt, CStateManager& mgr) {