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

Rename CStateManager::x8_idArr to CStateManager::x4_idArr to better match the game

This commit is contained in:
Phillip Stephens 2021-06-04 22:30:38 -07:00
parent 95f44be694
commit e9b2230c0a
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/CStateManager.cpp
View File

@ -2837,12 +2837,12 @@ TUniqueId CStateManager::AllocateUniqueId() {
} }
} while (GetAllObjectList().GetObjectByIndex(ourIndex) != nullptr); } while (GetAllObjectList().GetObjectByIndex(ourIndex) != nullptr);
x8_idArr[ourIndex] = (x8_idArr[ourIndex] + 1) & 0x3f; x4_idxArr[ourIndex] = (x4_idxArr[ourIndex] + 1) & 0x3f;
if (TUniqueId(ourIndex, x8_idArr[ourIndex]) == kInvalidUniqueId) { if (TUniqueId(ourIndex, x4_idxArr[ourIndex]) == kInvalidUniqueId) {
x8_idArr[ourIndex] = 0; x4_idxArr[ourIndex] = 0;
} }
return TUniqueId(ourIndex, x8_idArr[ourIndex]); return TUniqueId(ourIndex, x4_idxArr[ourIndex]);
} }
void CStateManager::DeferStateTransition(EStateManagerTransition t) { void CStateManager::DeferStateTransition(EStateManagerTransition t) {

2
Runtime/CStateManager.hpp
View File

@ -86,7 +86,7 @@ public:
private: private:
s16 x0_nextFreeIndex = 0; s16 x0_nextFreeIndex = 0;
std::array<u16, 1024> x8_idArr{}; std::array<u16, 1024> x4_idxArr{};
/* /*
std::unique_ptr<CObjectList> x80c_allObjs; std::unique_ptr<CObjectList> x80c_allObjs;