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

Merge commit 'f06ec91fa14ba653e58c4ee96ec85cfe1af43462' of https://github.com/AxioDL/urde

This commit is contained in:
Phillip Stephens 2020-12-25 21:06:51 -08:00
parent 914335275b f06ec91fa1
commit 27990a344a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/World/CMetroidPrimeRelay.cpp
View File

@ -49,7 +49,7 @@ void CMetroidPrimeRelay::GetOrBuildMetroidPrimeExo(CStateManager& mgr) {
return; return;
} }
for (const auto& act : mgr.GetPhysicsActorObjectList()) { for (const auto act : mgr.GetPhysicsActorObjectList()) {
if (CPatterned::CastTo<CMetroidPrimeExo>(act) != nullptr) { if (CPatterned::CastTo<CMetroidPrimeExo>(act) != nullptr) {
return; return;
} }

2
Runtime/World/CScriptMazeNode.cpp
View File

@ -116,7 +116,7 @@ void CScriptMazeNode::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, C
} }
} }
} }
for (const auto& ent : mgr.GetAllObjectList()) { for (const auto ent : mgr.GetAllObjectList()) {
if (TCastToPtr<CScriptMazeNode> node = ent) { if (TCastToPtr<CScriptMazeNode> node = ent) {
if (node->xe8_col == xe8_col - 1 && node->xec_row == xec_row && node->xf0_side == ESide::Right) { if (node->xe8_col == xe8_col - 1 && node->xec_row == xec_row && node->xf0_side == ESide::Right) {
auto& cell = maze->GetCell(xe8_col - 1, xec_row); auto& cell = maze->GetCell(xe8_col - 1, xec_row);