AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CScriptEffect: Eliminate variable shadowing 

Avoids clashing names.
This commit is contained in:
Lioncash 2020-04-17 16:31:00 -04:00
parent 8f5caca1e5
commit 0b05c906df
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/World/CScriptEffect.cpp
View File

@ -153,12 +153,14 @@ void CScriptEffect::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSt
if (oldActive != GetActive()) { if (oldActive != GetActive()) {
std::vector<TUniqueId> playIds; std::vector<TUniqueId> playIds;
for (const SConnection& conn : x20_conns) { for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Activate) if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Activate) {
continue; continue;
}
TUniqueId uid = mgr.GetIdForScript(conn.x8_objId); const TUniqueId scriptId = mgr.GetIdForScript(conn.x8_objId);
if (uid != kInvalidUniqueId) if (scriptId != kInvalidUniqueId) {
playIds.push_back(uid); playIds.push_back(scriptId);
}
} }
if (playIds.size() > 0) { if (playIds.size() > 0) {