2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 08:27:42 +00:00

TCastToPtr adjustments

This commit is contained in:
2017-01-18 14:30:02 -08:00
parent 3cc93ffd75
commit d1b55e23db
66 changed files with 197 additions and 87 deletions

View File

@@ -164,11 +164,8 @@ class CStateManager
void UpdateThermalVisor();
TUniqueId xf74_lastTrigger = kInvalidUniqueId;
TUniqueId xf76_lastRelay = kInvalidUniqueId;
public:
/* TODO: Figure out what these are
* Public for CScriptRelay
*/
TUniqueId xf76_ = kInvalidUniqueId;
/* TODO: Public for CFirstPersonCamera */
u32 x904_;
@@ -310,8 +307,11 @@ public:
CAiWaypointList& GetAiWaypointObjectList() const { return *x83c_aiWaypointObjs; }
CPlatformAndDoorList& GetPlatformAndDoorObjectList() const { return *x844_platformAndDoorObjs; }
std::pair<u32, u32> CalculateScanCompletionRate() const;
void SetLastTrigger(TUniqueId uid) { xf74_lastTrigger = uid; }
TUniqueId GetLastTrigger() const { return xf74_lastTrigger; }
void SetLastTriggerId(TUniqueId uid) { xf74_lastTrigger = uid; }
TUniqueId GetLastTriggerId() const { return xf74_lastTrigger; }
void SetLastRelayId(TUniqueId uid) { xf76_lastRelay = uid; }
TUniqueId* GetLastRelayIdPtr() { return &xf76_lastRelay; }
TUniqueId GetLastRelayId() const { return xf76_lastRelay; }
};
}