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

Match CScriptMazeNode::SendScriptMsgs

This commit is contained in:
Phillip Stephens 2022-09-15 21:30:20 -07:00
parent 7f768f8405
commit 972aa78e61
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp
View File

@ -81,8 +81,8 @@ public:
static void LoadMazeSeeds(); static void LoadMazeSeeds();
inline void SendScriptMsg(CStateManager& mgr, CEntity* to, EScriptObjectMessage msg) { static inline void SendScriptMsg(CStateManager& mgr, CEntity* to, TUniqueId sender, EScriptObjectMessage msg) {
mgr.SendScriptMsg(to, GetUniqueId(), msg); mgr.SendScriptMsg(to, sender, msg);
} }
private: private:
@ -117,4 +117,4 @@ private:
static uint sMazeSeeds[300]; static uint sMazeSeeds[300];
}; };
#endif #endif

10
src/MetroidPrime/ScriptObjects/CScriptMazeNode.cpp
View File

@ -300,13 +300,11 @@ void CScriptMazeNode::Reset(CStateManager& mgr) {
x11c_effectId = xfc_actorId = x10c_triggerId = xf4_gateEffectId = kInvalidUniqueId; x11c_effectId = xfc_actorId = x10c_triggerId = xf4_gateEffectId = kInvalidUniqueId;
} }
// TODO non-matching
// https://decomp.me/scratch/3F51I
void CScriptMazeNode::SendScriptMsgs(CStateManager& mgr, EScriptObjectMessage msg) { void CScriptMazeNode::SendScriptMsgs(CStateManager& mgr, EScriptObjectMessage msg) {
mgr.SendScriptMsg(mgr.ObjectById(x11c_effectId), GetUniqueId(), msg); SendScriptMsg(mgr, mgr.ObjectById(x11c_effectId), GetUniqueId(), msg);
mgr.SendScriptMsg(mgr.ObjectById(xfc_actorId), GetUniqueId(), msg); SendScriptMsg(mgr, mgr.ObjectById(xfc_actorId), GetUniqueId(), msg);
mgr.SendScriptMsg(mgr.ObjectById(x10c_triggerId), GetUniqueId(), msg); SendScriptMsg(mgr, mgr.ObjectById(x10c_triggerId), GetUniqueId(), msg);
mgr.SendScriptMsg(mgr.ObjectById(xf4_gateEffectId), GetUniqueId(), msg); SendScriptMsg(mgr, mgr.ObjectById(xf4_gateEffectId), GetUniqueId(), msg);
} }
void CScriptMazeNode::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { void CScriptMazeNode::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {