AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Update hecl, various fixes

Browse Source
This commit is contained in:
Phillip Stephens
2018-01-15 04:36:04 -08:00
parent 533b8775d4
commit 9255f0eeb0
6 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Runtime/World/CScriptCameraHint.cpp
View File

@@ -31,36 +31,33 @@ void CScriptCameraHint::Accept(IVisitor& visitor)
void CScriptCameraHint::InitializeInArea(CStateManager& mgr)
{
x164_delegatedCamera = kInvalidUniqueId;
for (CEntity* e : mgr.GetAllObjectList())
for (CEntity* ent : mgr.GetAllObjectList())
{
if (TCastToPtr<CEntity> ent = e)
for (const SConnection& conn : ent->GetConnectionList())
{
for (const SConnection& conn : ent->GetConnectionList())
{
if (mgr.GetIdForScript(conn.x8_objId) != GetUniqueId())
continue;
if (conn.x4_msg != EScriptObjectMessage::Increment &&
conn.x4_msg != EScriptObjectMessage::Decrement)
continue;
if (mgr.GetIdForScript(conn.x8_objId) != GetUniqueId())
continue;
if (conn.x4_msg != EScriptObjectMessage::Increment &&
conn.x4_msg != EScriptObjectMessage::Decrement)
continue;
for (auto it = ent->GetConnectionList().begin() ; it != ent->GetConnectionList().cend() ; ++it)
for (auto it = ent->GetConnectionList().begin() ; it != ent->GetConnectionList().cend() ; ++it)
{
const SConnection& conn2 = *it;
if (conn2.x4_msg != EScriptObjectMessage::Increment &&
conn2.x4_msg != EScriptObjectMessage::Decrement)
continue;
TUniqueId id = mgr.GetIdForScript(conn2.x8_objId);
if (TCastToPtr<CPathCamera>(mgr.ObjectById(id)) ||
TCastToPtr<CScriptSpindleCamera>(mgr.ObjectById((id))))
{
const SConnection& conn2 = *it;
if (conn2.x4_msg != EScriptObjectMessage::Increment &&
conn2.x4_msg != EScriptObjectMessage::Decrement)
continue;
TUniqueId id = mgr.GetIdForScript(conn2.x8_objId);
if (TCastToPtr<CPathCamera>(mgr.ObjectById(id)) ||
TCastToPtr<CScriptSpindleCamera>(mgr.ObjectById((id))))
{
ent->ConnectionList().erase(it);
if (x164_delegatedCamera != id)
x164_delegatedCamera = id;
break;
}
ent->ConnectionList().erase(it);
if (x164_delegatedCamera != id)
x164_delegatedCamera = id;
break;
}
break;
}
break;
}
}
}