diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-09-16 21:05:05 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-09-16 22:32:06 -0400 |
| commit | 690d0d579998f4507cc1bc5d88411464ea945ffb (patch) | |
| tree | 511b594ae1ffba04800862a22f147b4f37edffcd /src/d/a/obj/d_a_obj_tbox.cpp | |
| parent | e03a5b8080f8c82a4b3d4b3f395b64470946f86c (diff) | |
roomid -> mRoomID
Diffstat (limited to 'src/d/a/obj/d_a_obj_tbox.cpp')
| -rw-r--r-- | src/d/a/obj/d_a_obj_tbox.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp index a0f58a92..93bfd28e 100644 --- a/src/d/a/obj/d_a_obj_tbox.cpp +++ b/src/d/a/obj/d_a_obj_tbox.cpp @@ -958,9 +958,9 @@ int dAcTbox_c::create() { if (!isActualVisibleBox()) { return FAILED; } - int roomId_tmp = roomid; + int roomId_tmp = mRoomID; if (addActorToRoom(-1)) { - roomid = roomId_tmp; + mRoomID = roomId_tmp; changeLoadedEntitiesWithSet(); } setItemId((ITEM_ID)(mRotation.z & 0x1FF)); @@ -1030,7 +1030,7 @@ int dAcTbox_c::create() { } if (checkTboxFlag() || - (mSetSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mSetSceneFlag))) { + (mSetSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSetSceneFlag))) { mHasBeenOpened = true; } else { mHasBeenOpened = false; @@ -1189,7 +1189,7 @@ int dAcTbox_c::actorExecute() { (this->*mRegisterDowsingTarget)(); } - dRoom_c *r = dStage_c::GetInstance()->getRoom(roomid); + dRoom_c *r = dStage_c::GetInstance()->getRoom(mRoomID); bool hasFlags = r->checkFlag(0x1E); if (hasFlags) { setObjectProperty(0x200); @@ -1325,7 +1325,7 @@ int dAcTbox_c::actorExecuteInEvent() { (this->*mRegisterDowsingTarget)(); } - dRoom_c *r = dStage_c::GetInstance()->getRoom(roomid); + dRoom_c *r = dStage_c::GetInstance()->getRoom(mRoomID); bool hasFlags = r->checkFlag(0x1E); if (hasFlags) { setObjectProperty(0x200); @@ -1551,7 +1551,7 @@ void dAcTbox_c::setActionState() { case 1: mStateMgr.changeState(StateID_WaitOpen); break; case 3: if (mSpawnSceneFlag >= 0xFF || - SceneflagManager::sInstance->checkBoolFlag(roomid, mSpawnSceneFlag)) { + SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSpawnSceneFlag)) { mStateMgr.changeState(StateID_WaitOpen); } else { mStateMgr.changeState(StateID_WaitAppear); @@ -1725,7 +1725,7 @@ void dAcTbox_c::executeState_WaitAppear() { bool doIt; switch (field_0x120A) { case 0: doIt = hasCollectedAllTears(); break; - case 3: doIt = SceneflagManager::sInstance->checkBoolFlag(roomid, mSpawnSceneFlag); break; + case 3: doIt = SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSpawnSceneFlag); break; } if (doIt) { @@ -2028,7 +2028,7 @@ void dAcTbox_c::executeState_PresentItem() { } else { mHasBeenOpened = true; if (mSetSceneFlag < 0xFF) { - SceneflagManager::sInstance->setFlag(roomid, mSetSceneFlag); + SceneflagManager::sInstance->setFlag(mRoomID, mSetSceneFlag); } setTboxFlag(); if (mVariant == GODDESS) { |