PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use GetIdListForScript in CScriptSpecialFunction::AcceptScriptMsg 

Former-commit-id: 3fd463fc8a
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-03 19:30:33 +03:00
parent 01b02f2397
commit 250461ddec
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
View File

@ -343,15 +343,15 @@ void CScriptSpecialFunction::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
continue;
}
// GetIdListForScript seems very different between Ghidra and Metaforce
// const auto search = mgr.GetIdListForScript(conn->x8_objId);
rstl::pair< TUniqueId, TUniqueId >* it;
if (CActor* act = TCastToPtr< CActor >(mgr.ObjectById(it->second))) {
x198_ringControllers.push_back(SRingController(it->second, 0.f, false));
const CStateManager::TIdListResult& it = mgr.GetIdListForScript(conn->x8_objId);
if (it.first != it.second) {
TUniqueId uid = it.first->second;
if (CActor* act = TCastToPtr< CActor >(mgr.ObjectById(uid))) {
x198_ringControllers.push_back(SRingController(uid, 0.f, false));
act->RemoveMaterial(kMT_Occluder, mgr);
}
}
}
// TODO: there's an actual sort symbol, so it's a templated sort somewhere
// std::sort(x198_ringControllers.begin(), x198_ringControllers.end(),