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

CEntity: Rename ConnectionList() to GetConnectionList() 

Allows const overloading to function, preventing compilation errors from
occuring across constness changes.
This commit is contained in:
Lioncash 2020-03-24 21:29:42 -04:00
parent 8644b8393b
commit f2b1e44ee1
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/World/CEntity.hpp
View File

@ -61,8 +61,8 @@ public:
TEditorId GetEditorId() const { return xc_editorId; } TEditorId GetEditorId() const { return xc_editorId; }
void SendScriptMsgs(EScriptObjectState state, CStateManager& stateMgr, EScriptObjectMessage msg); void SendScriptMsgs(EScriptObjectState state, CStateManager& stateMgr, EScriptObjectMessage msg);
std::vector<SConnection>& GetConnectionList() { return x20_conns; }
const std::vector<SConnection>& GetConnectionList() const { return x20_conns; } const std::vector<SConnection>& GetConnectionList() const { return x20_conns; }
std::vector<SConnection>& ConnectionList() { return x20_conns; }
std::string_view GetName() const { return x10_name; } std::string_view GetName() const { return x10_name; }
}; };

2
Runtime/World/CScriptCameraHint.cpp
View File

@ -40,7 +40,7 @@ void CScriptCameraHint::InitializeInArea(CStateManager& mgr) {
continue; continue;
TUniqueId id = mgr.GetIdForScript(conn2.x8_objId); TUniqueId id = mgr.GetIdForScript(conn2.x8_objId);
if (TCastToPtr<CPathCamera>(mgr.ObjectById(id)) || TCastToPtr<CScriptSpindleCamera>(mgr.ObjectById((id)))) { if (TCastToPtr<CPathCamera>(mgr.ObjectById(id)) || TCastToPtr<CScriptSpindleCamera>(mgr.ObjectById((id)))) {
it = ent->ConnectionList().erase(it); it = ent->GetConnectionList().erase(it);
if (x164_delegatedCamera != id) if (x164_delegatedCamera != id)
x164_delegatedCamera = id; x164_delegatedCamera = id;
break; break;