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

Merge branch 'pr-277'

This commit is contained in:
Luke Street 2020-03-25 02:09:09 -04:00
parent f91536ebee f2b1e44ee1
commit 556f870dc8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CEntity.hpp
View File

@ -37,8 +37,8 @@ public:
virtual ~CEntity() = default;
CEntity(TUniqueId uid, const CEntityInfo& info, bool active, std::string_view name);
virtual void Accept(IVisitor& visitor) = 0;
virtual void PreThink(float, CStateManager&) {}
virtual void Think(float, CStateManager&) {}
virtual void PreThink(float dt, CStateManager& mgr) {}
virtual void Think(float dt, CStateManager& mgr) {}
virtual void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
virtual void SetActive(bool active) { x30_24_active = active; }
@ -61,8 +61,8 @@ public:
TEditorId GetEditorId() const { return xc_editorId; }
void SendScriptMsgs(EScriptObjectState state, CStateManager& stateMgr, EScriptObjectMessage msg);
std::vector<SConnection>& GetConnectionList() { 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; }
};

2
Runtime/World/CScriptCameraHint.cpp
View File

@ -40,7 +40,7 @@ void CScriptCameraHint::InitializeInArea(CStateManager& mgr) {
continue;
TUniqueId id = mgr.GetIdForScript(conn2.x8_objId);
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)
x164_delegatedCamera = id;
break;