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

CScriptMazeNode: Renaming & more cleanup

Browse Source
This commit is contained in:
Luke Street
2020-09-21 18:38:11 -04:00
parent c23a047a93
commit df2d191be8
3 changed files with 224 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/CStateManager.hpp
View File

@@ -191,7 +191,7 @@ private:
std::list<TUniqueId> xf3c_activeFlickerBats;
std::list<TUniqueId> xf54_activeParasites;
TUniqueId xf6c_playerActorHead = kInvalidUniqueId;
std::unique_ptr<CScriptMazeState> xf70_currentMaze;
std::unique_ptr<CMazeState> xf70_currentMaze;
TUniqueId xf74_lastTrigger = kInvalidUniqueId;
TUniqueId xf76_lastRelay = kInvalidUniqueId;
@@ -420,9 +420,9 @@ public:
return static_cast<CPlatformAndDoorList&>(*x808_objLists[7]);
}
std::pair<u32, u32> CalculateScanCompletionRate() const;
void SetCurrentMaze(std::unique_ptr<CScriptMazeState> maze) { xf70_currentMaze = std::move(maze); }
void SetCurrentMaze(std::unique_ptr<CMazeState> maze) { xf70_currentMaze = std::move(maze); }
void ClearCurrentMaze() { xf70_currentMaze.reset(); }
CScriptMazeState* GetCurrentMaze() { return xf70_currentMaze.get(); }
CMazeState* GetCurrentMaze() { return xf70_currentMaze.get(); }
void SetLastTriggerId(TUniqueId uid) { xf74_lastTrigger = uid; }
TUniqueId GetLastTriggerId() const { return xf74_lastTrigger; }
void SetLastRelayId(TUniqueId uid) { xf76_lastRelay = uid; }