mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-03 10:31:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

roomid -> mRoomID

Browse Source
This commit is contained in:
elijah-thomas774
2025-09-16 21:05:05 -04:00
parent e03a5b8080
commit 690d0d5799
54 changed files with 223 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_base.h
+2 -2
View File
@@ -79,7 +79,7 @@ public:
/* 0xD8 */ u32 mActorProperties;
/* 0xDC */ dAcRef_c<dAcBase_c> mActorNode;
/* 0xE8 */ u32 mTgSndAreaFlags;
/* 0xEC */ s8 roomid;
/* 0xEC */ s8 mRoomID;
/* 0xED */ u8 mActorSubtype;
/* 0xEE */ u8 mPolyAttr0;
/* 0xEF */ u8 mPolyAttr1;
@@ -152,7 +152,7 @@ public:
}
u32 getRoomId() {
return roomid;
return mRoomID;
}
void clearActorProperty(u32 property) {
include/d/a/e/d_a_e_hb_leaf.h
+1 -1
View File
@@ -37,7 +37,7 @@ private:
}
void doCheck() {
mTimeAreaStruct.check(roomid, mStartingPos, 0, 10.0f, 0.2f);
mTimeAreaStruct.check(mRoomID, mStartingPos, 0, 10.0f, 0.2f);
}
int getParam1() {
include/d/a/obj/d_a_obj_switch.h
+1 -1
View File
@@ -64,7 +64,7 @@ public:
static void rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *interactor);
bool checkOnFlag() {
return mOnSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mOnSceneFlag);
return mOnSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOnSceneFlag);
}
private:
include/d/a/obj/d_a_obj_tubo.h
+1 -1
View File
@@ -73,7 +73,7 @@ public:
}
bool checkSceneflag() {
return SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
return SceneflagManager::sInstance->checkFlag(mRoomID, mSceneflag);
}
STATE_FUNC_DECLARE(dAcOtubo_c, Wait);
include/d/t/d_t_action.h
+2 -2
View File
@@ -29,10 +29,10 @@ public:
void resetActiveArea();
bool checkActive1() const {
return SceneflagManager::sInstance->checkBoolFlag(roomid, mEnableFlag1);
return SceneflagManager::sInstance->checkBoolFlag(mRoomID, mEnableFlag1);
}
bool checkActive2() const {
return (!(mEnableFlag2 < 0xFF) || SceneflagManager::sInstance->checkBoolFlag(roomid, mEnableFlag2));
return (!(mEnableFlag2 < 0xFF) || SceneflagManager::sInstance->checkBoolFlag(mRoomID, mEnableFlag2));
}
private:
src/REL/d/a/d_a_bombf.cpp
+5 -5
View File
@@ -23,7 +23,7 @@ bool dAcBombf_c::createHeap() {
int dAcBombf_c::actorCreate() {
mDespawnSceneFlag = (mParams >> 8) & 0xFF;
field_0x3D4 = (mParams >> 16) & 0xF;
if (SceneflagManager::sInstance->checkBoolFlag(roomid, mDespawnSceneFlag)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mDespawnSceneFlag)) {
return FAILED;
}
@@ -76,7 +76,7 @@ int dAcBombf_c::actorPostCreate() {
}
if (field_0x3D2 == 0 || field_0x3D2 == 2) {
s32 b = dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, mPosition);
s32 b = dTimeAreaMgr_c::GetInstance()->fn_800B9B60(mRoomID, mPosition);
if (b != 0) {
mTimeAreaStruct.field_0x00 = 1.0f;
}
@@ -149,7 +149,7 @@ void dAcBombf_c::regrowBomb() {
actorParams1 = 2;
}
dAcObjBase_c *ac = dAcObjBase_c::create(
"Bomb", roomid, actorParams1, &mPosition, nullptr, nullptr, 0xFFFFFFFF, 0xFFFF, viewclip_idx
"Bomb", mRoomID, actorParams1, &mPosition, nullptr, nullptr, 0xFFFFFFFF, 0xFFFF, viewclip_idx
);
mBombRef.link(static_cast<dAcBomb_c *>(ac));
dAcBomb_c *bomb = mBombRef.get();
@@ -170,7 +170,7 @@ void dAcBombf_c::initializeState_Wait() {}
extern "C" u16 lbl_8057A750;
void dAcBombf_c::executeState_Wait() {
if (SceneflagManager::sInstance->checkBoolFlag(roomid, mDespawnSceneFlag)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mDespawnSceneFlag)) {
deleteRequest();
dAcBomb_c *bomb = mBombRef.get();
if (bomb != nullptr) {
@@ -188,7 +188,7 @@ void dAcBombf_c::executeState_Wait() {
mVec3_c upScaled = up * 30.0f;
mVec3_c checkPos = mPosition + upScaled;
if (mTimeAreaStruct.check(roomid, checkPos, 0, 30.0f, 0.1f) && field_0x3D4 != 1) {
if (mTimeAreaStruct.check(mRoomID, checkPos, 0, 30.0f, 0.1f) && field_0x3D4 != 1) {
if (mTimeAreaStruct.field_0x04 == 1) {
startSound(SE_TIMESLIP_TIMESLIP);
} else {
src/REL/d/a/e/d_a_e_sm.cpp
+3 -3
View File
@@ -323,7 +323,7 @@ int dAcEsm_c::doDelete() {
int dAcEsm_c::actorExecute() {
mLightInfo.SetScale(0.f);
if (shift8_0xFF != 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, shift8_0xFF)) {
if (shift8_0xFF != 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, shift8_0xFF)) {
return SUCCEEDED;
}
@@ -709,7 +709,7 @@ int dAcEsm_c::draw() {
if (mScale.squareMagXZ() < 0.0004f) {
return SUCCEEDED;
}
if (shift8_0xFF != 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, shift8_0xFF)) {
if (shift8_0xFF != 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, shift8_0xFF)) {
return SUCCEEDED;
}
@@ -993,7 +993,7 @@ void dAcEsm_c::fn_187_4540(int param0) {
f32 f = 16384.f;
dAcEsm_c *pChild = static_cast<dAcEsm_c *>(
create(fProfile::E_SM, roomid, (mParams & ~0xFF) | mType, &spawnPos, &rot, nullptr, 0)
create(fProfile::E_SM, mRoomID, (mParams & ~0xFF) | mType, &spawnPos, &rot, nullptr, 0)
);
if (pChild == nullptr) {
return;
src/REL/d/a/npc/d_a_npc_saltalk.cpp
+2 -2
View File
@@ -38,7 +38,7 @@ int dAcNpcSltk_c::actorCreate() {
mAreaIndex = mRotation.z & 0xFF;
if (mAreaIndex < 0xFF) {
mpArea = getAreaForIndexInRoom(mAreaIndex, roomid);
mpArea = getAreaForIndexInRoom(mAreaIndex, mRoomID);
if (mpArea == nullptr) {
return FAILED;
}
@@ -130,7 +130,7 @@ bool dAcNpcSltk_c::isSomething1() const {
bool dAcNpcSltk_c::checkSomething(mVec3_c pos) const {
if (mAreaIndex != 0xFF) {
return checkPosInArea(mAreaIndex, roomid, pos, &mpArea) == 1;
return checkPosInArea(mAreaIndex, mRoomID, pos, &mpArea) == 1;
} else {
mVec3_c dist = pos - mPosition;
if (dist.squareMagXZ() <= field_0x758 * field_0x758) {
src/REL/d/a/obj/d_a_obj_F302_light.cpp
+5 -5
View File
@@ -41,7 +41,7 @@ int dAcOF302Light_c::actorCreate() {
forwardMaxSpeed = -40.f;
updateMatrix();
mMdl.setLocalMtx(mWorldMtx);
if (field_0x440 < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, field_0x440)) {
if (field_0x440 < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, field_0x440)) {
mStateMgr.changeState(StateID_Wait);
} else {
mStateMgr.changeState(StateID_SwitchOn);
@@ -106,8 +106,8 @@ void dAcOF302Light_c::finalizeState_Wait() {}
void dAcOF302Light_c::initializeState_SwitchOn() {
mMdl.setAnm(mAnmMatClr[1]);
mTimeArea.check(roomid, mPosition, 0, 30.f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, mPosition)) {
mTimeArea.check(mRoomID, mPosition, 0, 30.f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(mRoomID, mPosition)) {
mAnmMatClr[1].setRate(1.f, 0);
mAnmMatClr[1].setFrame(40.f, 0);
} else {
@@ -116,8 +116,8 @@ void dAcOF302Light_c::initializeState_SwitchOn() {
}
void dAcOF302Light_c::executeState_SwitchOn() {
mTimeArea.check(roomid, mPosition, 0, 30.f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, mPosition)) {
mTimeArea.check(mRoomID, mPosition, 0, 30.f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(mRoomID, mPosition)) {
mAnmMatClr[1].setRate(1.f, 0);
} else {
if (mAnmMatClr[1].getFrame(0) == 0.f) {
src/REL/d/a/obj/d_a_obj_appear_bridge.cpp
+4 -4
View File
@@ -73,7 +73,7 @@ void dAcOappearBridge_c::initializeState_Wait() {
dBgS::GetInstance()->Release(&mCollision);
}
void dAcOappearBridge_c::executeState_Wait() {
if (checkPosInArea(mAreaIdx, roomid, dAcPy_c::LINK->mPosition, nullptr)) {
if (checkPosInArea(mAreaIdx, mRoomID, dAcPy_c::LINK->mPosition, nullptr)) {
mStateMgr.changeState(StateID_Appear);
}
}
@@ -86,7 +86,7 @@ void dAcOappearBridge_c::finalizeState_Wait() {
if (mEventId != 0xFF) {
u32 f1 = FLAGS_1;
u32 f2 = FLAGS_2;
Event ev = Event(mEventId, roomid, f2 & ~f1, nullptr, nullptr);
Event ev = Event(mEventId, mRoomID, f2 & ~f1, nullptr, nullptr);
mActorEvent.scheduleEvent(ev, 0);
}
}
@@ -104,7 +104,7 @@ void dAcOappearBridge_c::executeState_Appear() {
}
mSrtAnm.play();
mClrAnm.play();
if (!checkPosInArea(mAreaIdx, roomid, dAcPy_c::LINK->mPosition, nullptr)) {
if (!checkPosInArea(mAreaIdx, mRoomID, dAcPy_c::LINK->mPosition, nullptr)) {
mStateMgr.changeState(StateID_Disappear);
}
}
@@ -120,7 +120,7 @@ void dAcOappearBridge_c::executeState_Disappear() {
}
mSrtAnm.play();
mClrAnm.play();
if (checkPosInArea(mAreaIdx, roomid, dAcPy_c::LINK->mPosition, nullptr)) {
if (checkPosInArea(mAreaIdx, mRoomID, dAcPy_c::LINK->mPosition, nullptr)) {
mStateMgr.changeState(StateID_Appear);
} else {
if (mClrAnm.isStop(0)) {
src/REL/d/a/obj/d_a_obj_block_underground.cpp
+3 -3
View File
@@ -117,7 +117,7 @@ bool dAcOBlockUnderground::createHeap() {
int dAcOBlockUnderground::actorCreate() {
u8 sceneFlag = getSecondSceneFlag();
if (sceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, sceneFlag)) {
if (sceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, sceneFlag)) {
return FAILED;
}
@@ -185,12 +185,12 @@ int dAcOBlockUnderground::actorExecute() {
u8 firstSceneFlag = getFirstSceneFlag();
if (firstSceneFlag < 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, firstSceneFlag);
SceneflagManager::sInstance->setFlag(mRoomID, firstSceneFlag);
}
u8 secondSceneFlag = getSecondSceneFlag();
if (secondSceneFlag < 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, secondSceneFlag);
SceneflagManager::sInstance->setFlag(mRoomID, secondSceneFlag);
}
deleteRequest();
src/REL/d/a/obj/d_a_obj_bstone.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ int dAcObstonec::doDelete() {
int dAcObstonec::actorExecute() {
f32 tmp = 1.0f;
if (mVariant != 0) {
tmp = dTimeAreaMgr_c::GetInstance()->checkPositionIsInPastState(roomid, mPosition, nullptr, mScaleMag);
tmp = dTimeAreaMgr_c::GetInstance()->checkPositionIsInPastState(mRoomID, mPosition, nullptr, mScaleMag);
if (mVariant != 1) {
if (tmp > 0.0f) {
mMdl.setPriorityDraw(0xB, 0);
src/REL/d/a/obj/d_a_obj_chair.cpp
+4 -4
View File
@@ -149,12 +149,12 @@ int dAcOChair_c::actorExecute() {
// Set the flag that link is sitting
if (checkObjectProperty(0x8000) && isPlayerSitting()) {
if (mSceneflag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mSceneflag)) {
SceneflagManager::sInstance->setFlag(roomid, mSceneflag);
if (mSceneflag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag)) {
SceneflagManager::sInstance->setFlag(mRoomID, mSceneflag);
}
} else {
if (mSceneflag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mSceneflag)) {
SceneflagManager::sInstance->unsetFlag(roomid, mSceneflag);
if (mSceneflag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mSceneflag);
}
}
src/REL/d/a/obj/d_a_obj_chest.cpp
+3 -3
View File
@@ -131,7 +131,7 @@ int dAcOChest_c::create() {
if ((s32)getFromParams(0x10, 0xFF) != 0xFF) {
mInsideMdl.setLocalMtx(mWorldMtx);
}
if (dScGame_c::isCurrentStage("F001r") && roomid == 1 && 900.0f < mPosition.x && mPosition.x < 1000.0f &&
if (dScGame_c::isCurrentStage("F001r") && mRoomID == 1 && 900.0f < mPosition.x && mPosition.x < 1000.0f &&
-50.0f < mPosition.y && mPosition.y < 50.0f && -2730.0f < mPosition.z && mPosition.z < -2630.0f) {
mIsLinksCloset = true;
}
@@ -245,7 +245,7 @@ void dAcOChest_c::changeStateOpen() {
}
u32 flag = getFromParams(0, 0xFF);
if (flag < 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, flag);
SceneflagManager::sInstance->setFlag(mRoomID, flag);
}
fn_326_1470();
mStateMgr.changeState(StateID_OpenEvent);
@@ -319,7 +319,7 @@ bool dAcOChest_c::hasBeenOpened() {
if (flag >= 0xFF) {
return true;
}
return (flag < 0xFF) && SceneflagManager::sInstance->checkBoolFlag(roomid, flag);
return (flag < 0xFF) && SceneflagManager::sInstance->checkBoolFlag(mRoomID, flag);
}
void dAcOChest_c::stateOpenUpdate2() {
src/REL/d/a/obj/d_a_obj_clearness_wall.cpp
+6 -6
View File
@@ -44,19 +44,19 @@ int dAcOclearnessWall_c::doDelete() {
int dAcOclearnessWall_c::actorExecute() {
switch (field_0x542) {
case 0: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
bool flag = SceneflagManager::sInstance->checkFlag(mRoomID, mSceneflag);
if (flag) {
deleteRequest();
}
break;
}
case 1: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
bool flag = SceneflagManager::sInstance->checkFlag(mRoomID, mSceneflag);
if (flag && field_0x543) {
dBgS::GetInstance()->Release(&mBgW);
field_0x543 = false;
} else {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
bool flag = SceneflagManager::sInstance->checkFlag(mRoomID, mSceneflag);
if (!flag && !field_0x543) {
dBgS::GetInstance()->Regist(&mBgW, this);
field_0x543 = true;
@@ -65,12 +65,12 @@ int dAcOclearnessWall_c::actorExecute() {
break;
}
case 2: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
bool flag = SceneflagManager::sInstance->checkFlag(mRoomID, mSceneflag);
if (flag && field_0x543) {
dBgS::GetInstance()->Regist(&mBgW, this);
field_0x543 = false;
} else {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
bool flag = SceneflagManager::sInstance->checkFlag(mRoomID, mSceneflag);
if (!flag && !field_0x543) {
dBgS::GetInstance()->Release(&mBgW);
field_0x543 = true;
@@ -79,7 +79,7 @@ int dAcOclearnessWall_c::actorExecute() {
break;
}
default: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
bool flag = SceneflagManager::sInstance->checkFlag(mRoomID, mSceneflag);
if (flag) {
deleteRequest();
}
src/REL/d/a/obj/d_a_obj_distant_ship.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ int dAcOdistantShip_c::create() {
u8 flag = getFromParams(0, 0xFF);
mSubtype = getFromParams(8, 0xF);
if (SceneflagManager::sInstance->checkBoolFlag(roomid, flag)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, flag)) {
mIsVisible = true;
}
src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp
+8 -8
View File
@@ -95,7 +95,7 @@ bool dAcODungeonShip_c::createHeap() {
}
// wat
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, (mParams >> 0x10) & 0xFF)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, (mParams >> 0x10) & 0xFF)) {
goto ok;
} else {
bool result = mBg.InitMapStuff(&mAllocator);
@@ -112,7 +112,7 @@ int dAcODungeonShip_c::create() {
return FAILED;
}
if (SceneflagManager::sInstance->checkBoolFlag(roomid, (mParams >> 0x10) & 0xFF)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, (mParams >> 0x10) & 0xFF)) {
mIsDocked = true;
}
@@ -132,7 +132,7 @@ int dAcODungeonShip_c::create() {
forwardAccel = 0.0f;
forwardMaxSpeed = 0.0f;
boundingBox.Set(mVec3_c(-6000.0f, -500.0f, -2000.0f), mVec3_c(5000.0f, 4000.0f, 2000.0f));
if (SceneflagManager::sInstance->checkBoolFlag(roomid, (mParams >> 0x10) & 0xFF)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, (mParams >> 0x10) & 0xFF)) {
dBgS::GetInstance()->RegistBg(&mBg, this);
mStateMgr.changeState(StateID_End);
} else {
@@ -144,7 +144,7 @@ int dAcODungeonShip_c::create() {
mEffects[1].init(this);
field_0x8D9 = 0;
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, (mParams >> 0x10) & 0xFF)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, (mParams >> 0x10) & 0xFF)) {
mDowsingOffset.set(0.0f, 500.0f, 0.0f);
mDowsingTarget.initialize(DowsingTarget::SLOT_STORY_EVENT, 0, &mDowsingOffset, 10000.0);
mDowsingTarget.doRegister();
@@ -249,7 +249,7 @@ void dAcODungeonShip_c::executeState_Transparency() {
} else if (mNumTimesHit == 2) {
field_0x863 = 0;
mNumTimesHit++;
SceneflagManager::sInstance->setFlag(roomid, (mParams >> 0x10) & 0xFF);
SceneflagManager::sInstance->setFlag(mRoomID, (mParams >> 0x10) & 0xFF);
mAppearEvent = mAppearEventFromParam;
field_0x8D8 = 1;
mStateMgr.changeState(StateID_AppearEvent);
@@ -316,7 +316,7 @@ void dAcODungeonShip_c::finalizeState_Transparency() {}
void dAcODungeonShip_c::initializeState_AppearEvent() {
if (mAppearEvent != 0xFF) {
Event ev(mAppearEvent, roomid, 0x100001, (void *)&eventIn_Wrapper, (void *)&eventEnd_Wrapper);
Event ev(mAppearEvent, mRoomID, 0x100001, (void *)&eventIn_Wrapper, (void *)&eventEnd_Wrapper);
mEvent.scheduleEvent(ev, 0);
}
}
@@ -379,7 +379,7 @@ void dAcODungeonShip_c::executeState_AppearEvent() {
default: mEvent.advanceNext(); break;
}
} else {
Event ev(mAppearEvent, roomid, 0x100001, (void *)&eventIn_Wrapper, (void *)&eventEnd_Wrapper);
Event ev(mAppearEvent, mRoomID, 0x100001, (void *)&eventIn_Wrapper, (void *)&eventEnd_Wrapper);
mEvent.scheduleEvent(ev, 0);
}
} else {
@@ -429,7 +429,7 @@ void dAcODungeonShip_c::fn_485_1660() {
f32 speed = 0.0f;
f32 unk = 0.0001f;
field_0x856 = 1;
if (mPath.init(mPathIdx, roomid, 0, 0, false, time, speed, unk)) {
if (mPath.init(mPathIdx, mRoomID, 0, 0, false, time, speed, unk)) {
mPath.setSegment(0, time);
mPosition = mPath.getPosition();
mOldPosition = mPath.getPosition();
src/REL/d/a/obj/d_a_obj_fence_boko.cpp
+2 -2
View File
@@ -24,7 +24,7 @@ int dAcOfenceBoko_c::create() {
dBgS::GetInstance()->Regist(&mCollision, this);
dBgS::GetInstance()->RegistBg(&mCollision, this);
mCollision.mRoomId = dStage_c::GetInstance()->getCurrRoomId();
roomid = mCollision.mRoomId;
mRoomID = mCollision.mRoomId;
mModel.setPriorityDraw(0x1C, 0x9);
boundingBox.Set(mVec3_c(-210.0f, -10.0f, -20.0f), mVec3_c(210.0f, 340.0f, 20.0f));
mCullingDistance = 50000.0f;
@@ -41,7 +41,7 @@ int dAcOfenceBoko_c::actorExecute() {
if (!field_0x560) {
if (dBgS_ObjGndChk::CheckPos(mPosition + mVec3_c::Ey * 100.f)) {
mCollision.mRoomId = dBgS_ObjGndChk::GetRoomID();
roomid = mCollision.mRoomId;
mRoomID = mCollision.mRoomId;
field_0x560 = true;
}
}
src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ int dAcOFruitGutsLeaf_c::actorCreate() {
}
int dAcOFruitGutsLeaf_c::actorPostCreate() {
if (hideInPast() && !dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, mPosition)) {
if (hideInPast() && !dTimeAreaMgr_c::GetInstance()->fn_800B9B60(mRoomID, mPosition)) {
mScale.x = 0.0f;
mScale.y = 0.0f;
mScale.z = 0.0f;
@@ -69,7 +69,7 @@ int dAcOFruitGutsLeaf_c::actorPostCreate() {
}
int dAcOFruitGutsLeaf_c::actorExecute() {
if (hideInPast()) {
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, mPosition)) {
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(mRoomID, mPosition)) {
if (mScale.x != 1.0f) {
sLib::chase(&mScale.x, 1.0f, 0.05f);
mScale.z = mScale.x;
src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
+4 -4
View File
@@ -1107,7 +1107,7 @@ void dAcOivyRope_c::fn_256_E3E0() {
static u32 FLAGS_2 = 0x00100001;
u32 f1 = FLAGS_1;
u32 f2 = FLAGS_2;
Event e(mEventIdx, roomid, f2 & ~f1, 0, 0);
Event e(mEventIdx, mRoomID, f2 & ~f1, 0, 0);
mEvent.scheduleEvent(e, 0);
}
}
@@ -1160,7 +1160,7 @@ bool dAcOivyRope_c::fn_256_E790() {
}
if (ret) {
SceneflagManager::sInstance->setFlag(roomid, mWoodTagSceneflag);
SceneflagManager::sInstance->setFlag(mRoomID, mWoodTagSceneflag);
}
return ret;
@@ -1168,14 +1168,14 @@ bool dAcOivyRope_c::fn_256_E790() {
bool dAcOivyRope_c::canBeLinkedToWoodTag() {
if (mSubtype == 3) {
return !SceneflagManager::sInstance->checkBoolFlag(roomid, mWoodTagSceneflag);
return !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mWoodTagSceneflag);
}
return false;
}
bool dAcOivyRope_c::drop() {
bool dropFlag;
if (mDropsceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mDropsceneFlag)) {
if (mDropsceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mDropsceneFlag)) {
dropFlag = false;
} else {
dropFlag = true;
src/REL/d/a/obj/d_a_obj_pool_cock.cpp
+2 -2
View File
@@ -28,7 +28,7 @@ int dAcOPoolCock_c::actorCreate() {
mOpenDirection = mVec3_c::Ez;
mOpenDirection.rotY(mRotation.y);
if (mOpenSceneflag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mOpenSceneflag)) {
if (mOpenSceneflag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOpenSceneflag)) {
mOpenProgress = 400.0f;
}
@@ -85,7 +85,7 @@ int dAcOPoolCock_c::draw() {
void dAcOPoolCock_c::initializeState_Wait() {}
void dAcOPoolCock_c::executeState_Wait() {
if (mOpenSceneflag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mOpenSceneflag)) {
if (mOpenSceneflag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOpenSceneflag)) {
sLib::chase(&mOpenProgress, 400.0f, 5.0f);
if (!mHasActivatedVortex) {
dAcOVortex_c *vortex = (dAcOVortex_c *)fManager_c::searchBaseByProfName(fProfile::OBJ_VORTEX, nullptr);
src/REL/d/a/obj/d_a_obj_stream_lava.cpp
+7 -7
View File
@@ -74,7 +74,7 @@ int dAcOstreamLava_c::create() {
mHideActor = !getFromParams(0x14, 1); // (params >> 0x14 & 1) == 0;
mModel.setAnm(mAnmMatClr);
bool shouldStream = SceneflagManager::sInstance->checkFlag(roomid, mShouldStreamSceneflag);
bool shouldStream = SceneflagManager::sInstance->checkFlag(mRoomID, mShouldStreamSceneflag);
if (shouldStream) {
mStateMgr.changeState(StateID_Stream);
} else {
@@ -87,9 +87,9 @@ int dAcOstreamLava_c::create() {
boundingBox.Set(min, max);
mCullingDistance = 50000.0f;
int roomId_tmp = roomid;
int roomId_tmp = mRoomID;
if (addActorToRoom(-1)) {
roomid = roomId_tmp;
mRoomID = roomId_tmp;
changeLoadedEntitiesWithSet();
}
@@ -106,7 +106,7 @@ int dAcOstreamLava_c::actorExecute() {
mStateMgr.executeState();
mAnmMatClr.play();
dRoom_c *currentRoom = dStage_c::GetInstance()->getRoom(roomid);
dRoom_c *currentRoom = dStage_c::GetInstance()->getRoom(mRoomID);
if (currentRoom->checkFlag(2)) {
setObjectProperty(0x200);
@@ -131,7 +131,7 @@ void dAcOstreamLava_c::initializeState_Wait() {
void dAcOstreamLava_c::executeState_Wait() {
mAnmTexSrtWait.play();
bool shouldStream = SceneflagManager::sInstance->checkFlag(roomid, mShouldStreamSceneflag);
bool shouldStream = SceneflagManager::sInstance->checkFlag(mRoomID, mShouldStreamSceneflag);
if (shouldStream) {
mStateMgr.changeState(StateID_Stream);
}
@@ -155,7 +155,7 @@ void dAcOstreamLava_c::finalizeState_Wait() {
// Swaps the numbers in .data and swaps the operands in andc
// u32 eventFlag = Event::makeEventFlag(0x100001, 0x1);
Event ev(mEventId, roomid, eventFlag, nullptr, nullptr);
Event ev(mEventId, mRoomID, eventFlag, nullptr, nullptr);
mEvent.scheduleEvent(ev, 0);
}
}
@@ -167,7 +167,7 @@ void dAcOstreamLava_c::initializeState_Stream() {
void dAcOstreamLava_c::executeState_Stream() {
mAnmTexSrtWait.play();
bool shouldStream = SceneflagManager::sInstance->checkFlag(roomid, mShouldStreamSceneflag);
bool shouldStream = SceneflagManager::sInstance->checkFlag(mRoomID, mShouldStreamSceneflag);
if (!shouldStream) {
mStateMgr.changeState(StateID_Wait);
}
src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp
+4 -4
View File
@@ -79,8 +79,8 @@ int dAcOTimeStageBg_c::actorCreate() {
}
int dAcOTimeStageBg_c::actorPostCreate() {
mTimeArea.check(roomid, field_0x3EC, 0, 30.0f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, field_0x3EC)) {
mTimeArea.check(mRoomID, field_0x3EC, 0, 30.0f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(mRoomID, field_0x3EC)) {
field_0x3F8 = 255.0f;
} else {
field_0x3F8 = 0.0f;
@@ -116,8 +116,8 @@ int dAcOTimeStageBg_c::draw() {
void dAcOTimeStageBg_c::initializeState_Wait() {}
void dAcOTimeStageBg_c::executeState_Wait() {
f32 target = 0.0f;
mTimeArea.check(roomid, field_0x3EC, 0, 30.0f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, field_0x3EC)) {
mTimeArea.check(mRoomID, field_0x3EC, 0, 30.0f, 0.1f);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(mRoomID, field_0x3EC)) {
if (mTimeArea.getDistMaybe() == 1.0f) {
target = 255.0f;
}
src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ void dAcOtoD3StoneFigure_c::initializeState_OneEye() {
void dAcOtoD3StoneFigure_c::executeState_OneEye() {
if (EventManager::isInEvent(this, "D3OpenStart")) {
dScGame_c::GetInstance()->triggerExit(roomid, mExitId);
dScGame_c::GetInstance()->triggerExit(mRoomID, mExitId);
} else {
if (hasStoneOfTrials() && dScGame_c::currentSpawnInfo.getTimeOfDay() != SpawnInfo::NIGHT) {
// These are interaction related
src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
+4 -4
View File
@@ -486,7 +486,7 @@ void dAcOTowerHandD101_c::setSceneFlag(int flag) const {
if (theFlag >= 255) {
return;
}
SceneflagManager::sInstance->setFlag(roomid, theFlag);
SceneflagManager::sInstance->setFlag(mRoomID, theFlag);
}
void dAcOTowerHandD101_c::unsetSceneFlag(int flag) const {
@@ -494,7 +494,7 @@ void dAcOTowerHandD101_c::unsetSceneFlag(int flag) const {
if (theFlag >= 255) {
return;
}
SceneflagManager::sInstance->unsetFlag(roomid, theFlag);
SceneflagManager::sInstance->unsetFlag(mRoomID, theFlag);
}
bool dAcOTowerHandD101_c::checkSceneFlag1(int flag, bool &result) const {
@@ -502,7 +502,7 @@ bool dAcOTowerHandD101_c::checkSceneFlag1(int flag, bool &result) const {
// I guess 255 is not a valid scene flag
bool isValidSceneFlag = theFlag < 255;
if (isValidSceneFlag) {
result = SceneflagManager::sInstance->checkBoolFlag(roomid, theFlag);
result = SceneflagManager::sInstance->checkBoolFlag(mRoomID, theFlag);
}
return isValidSceneFlag;
}
@@ -531,7 +531,7 @@ inline u32 getFlags() {
}
void dAcOTowerHandD101_c::doEvent() {
Event e = Event(getEventId(), roomid, getFlags(), (void *)&eventCallback, nullptr);
Event e = Event(getEventId(), mRoomID, getFlags(), (void *)&eventCallback, nullptr);
getEventStuff().scheduleEvent(e, 0);
}
src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp
+2 -2
View File
@@ -64,7 +64,7 @@ int dAcOtrapRock1_c::draw() {
void dAcOtrapRock1_c::initializeState_TrapWait() {}
void dAcOtrapRock1_c::executeState_TrapWait() {
if (SceneflagManager::sInstance->checkBoolFlag(roomid, mActivationSceneFlag)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mActivationSceneFlag)) {
mStateMgr.changeState(StateID_TrapAction);
}
}
@@ -79,7 +79,7 @@ void dAcOtrapRock1_c::initializeState_TrapAction() {
}
void dAcOtrapRock1_c::executeState_TrapAction() {
if (SceneflagManager::sInstance->checkBoolFlag(roomid, mReturnSceneFlag)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mReturnSceneFlag)) {
mStateMgr.changeState(StateID_TrapReturn);
} else if (field_0x59E == 0 || mFrameCounter > 4) {
// After 5 frames, move mRotation.x to 0x4000, then stay until return
src/REL/d/a/obj/d_a_obj_tubo.cpp
+2 -2
View File
@@ -390,7 +390,7 @@ void dAcOtubo_c::finalizeState_Slope() {}
void dAcOtubo_c::initializeState_Rebirth() {
SpecialItemDropMgr *mgr = SpecialItemDropMgr::GetInstance();
mgr->giveSpecialDropItem(getParams2UpperByte(), roomid, &mPosition, 0, mRotation.y, -1);
mgr->giveSpecialDropItem(getParams2UpperByte(), mRoomID, &mPosition, 0, mRotation.y, -1);
mField_0x9AC = mPosition;
mpPosition = &mField_0x9AC;
mField_0x9F6 = 0;
@@ -472,7 +472,7 @@ void dAcOtubo_c::destroy() {
startSound(SE_Tubo_BREAK);
if (mSceneflag < 0xFF && !checkSceneflag()) {
SceneflagManager::sInstance->setFlag(roomid, mSceneflag);
SceneflagManager::sInstance->setFlag(mRoomID, mSceneflag);
}
if (mbField_0x9F0) {
src/REL/d/a/obj/d_a_obj_underground_switch.cpp
+10 -10
View File
@@ -48,7 +48,7 @@ int dAcOUgSwitch_c::create() {
updateMatrix();
mMdl.setLocalMtx(mWorldMtx);
mMdl.setPriorityDraw(0x82, 0x7F);
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, mActiveSceneFlag)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mActiveSceneFlag)) {
if (mVariant == 0) {
mStateMgr.changeState(StateID_Active);
} else {
@@ -74,11 +74,11 @@ int dAcOUgSwitch_c::actorExecute() {
int dAcOUgSwitch_c::actorExecuteInEvent() {
if (EventManager::isInEvent(this, "OnSwitchCount")) {
if (mOnEventTimer != 0 && --mOnEventTimer == 0) {
if (mVariant == 0 && !SceneflagManager::sInstance->checkBoolFlag(roomid, mActiveSceneFlag)) {
SceneflagManager::sInstance->setFlag(roomid, mActiveSceneFlag);
if (mVariant == 0 && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mActiveSceneFlag)) {
SceneflagManager::sInstance->setFlag(mRoomID, mActiveSceneFlag);
} else {
if (mVariant == 1 && !SceneflagManager::sInstance->checkBoolFlag(roomid, field_0x3BD)) {
SceneflagManager::sInstance->setFlag(roomid, field_0x3BD);
if (mVariant == 1 && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, field_0x3BD)) {
SceneflagManager::sInstance->setFlag(mRoomID, field_0x3BD);
}
}
EventManager::finishEvent(this, "OnSwitchCount");
@@ -97,7 +97,7 @@ void dAcOUgSwitch_c::initializeState_Off() {
mAnmClr.setFrame(0.0f, 0);
}
void dAcOUgSwitch_c::executeState_Off() {
if (mVariant == 1 && SceneflagManager::sInstance->checkBoolFlag(roomid, mActiveSceneFlag)) {
if (mVariant == 1 && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mActiveSceneFlag)) {
mStateMgr.changeState(StateID_Active);
}
}
@@ -106,7 +106,7 @@ void dAcOUgSwitch_c::initializeState_Active() {
mAnmClr.setFrame(1.0f, 0);
}
void dAcOUgSwitch_c::executeState_Active() {
if (mVariant == 0 && !SceneflagManager::sInstance->checkBoolFlag(roomid, mActiveSceneFlag)) {
if (mVariant == 0 && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mActiveSceneFlag)) {
if (isWithinPlayerRadius(sActivationRadius) && dAcPy_c::LINK->checkActionFlags(dAcPy_c::FLG0_CRAWLING)) {
mOnEventTimer = sEventTimer;
startSound(SE_UgSwitc_ON_ZERO);
@@ -114,14 +114,14 @@ void dAcOUgSwitch_c::executeState_Active() {
}
}
if (mVariant == 1) {
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, field_0x3BD)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, field_0x3BD)) {
if (isWithinPlayerRadius(sActivationRadius) && dAcPy_c::LINK->checkActionFlags(dAcPy_c::FLG0_CRAWLING)) {
mOnEventTimer = sEventTimer;
startSound(SE_UgSwitc_ON);
mStateMgr.changeState(StateID_On);
}
}
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, mActiveSceneFlag)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mActiveSceneFlag)) {
mStateMgr.changeState(StateID_Off);
}
}
@@ -137,7 +137,7 @@ void dAcOUgSwitch_c::initializeState_On() {
EventManager::alsoSetAsCurrentEvent(this, &event, nullptr);
}
void dAcOUgSwitch_c::executeState_On() {
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, mActiveSceneFlag)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mActiveSceneFlag)) {
if (mVariant == 0) {
mStateMgr.changeState(StateID_Active);
} else {
src/REL/d/t/d_t_col_bomb_shield.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ int dTgColBombShield::doDelete() {
}
int dTgColBombShield::actorExecute() {
if (dAcPy_c::LINK != nullptr && roomid == dAcPy_c::LINK->roomid) {
if (dAcPy_c::LINK != nullptr && mRoomID == dAcPy_c::LINK->mRoomID) {
dCcS::GetInstance()->SetArea(&mColMtx);
}
return SUCCEEDED;
src/REL/d/t/d_t_dowsing.cpp
+2 -2
View File
@@ -29,9 +29,9 @@ int dTgDowsing_c::doDelete() {
}
int dTgDowsing_c::actorExecute() {
if (getTriggerSceneFlag() < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, getTriggerSceneFlag()) ||
if (getTriggerSceneFlag() < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, getTriggerSceneFlag()) ||
getUntriggerSceneFlag() < 0xFF &&
!SceneflagManager::sInstance->checkBoolFlag(roomid, getUntriggerSceneFlag()) ||
!SceneflagManager::sInstance->checkBoolFlag(mRoomID, getUntriggerSceneFlag()) ||
!checkDowsing()) {
mDowsingTarget.doUnregister();
mTargetActive = false;
src/REL/d/t/d_t_fairytag.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ void dTgFairy_c::createFairies() {
mVec3_c v = calcLocation(f);
v2 = v;
dAcObjFairy_c *ac = static_cast<dAcObjFairy_c *>(
dAcObjBase_c::create("Fairy", roomid, fairyParams1, &v2, nullptr, nullptr, -1, -1, mViewClipIdx)
dAcObjBase_c::create("Fairy", mRoomID, fairyParams1, &v2, nullptr, nullptr, -1, -1, mViewClipIdx)
);
if (ac != nullptr) {
mpFairyRefs[i].link(ac);
src/REL/d/t/d_t_gate_to_ground.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ int dTgGateToGround_c::actorExecute() {
} else {
if (params_00_00_00_FF != -1) {
cam = dScGame_c::getCamera(0);
fn_80080960(cam->getField_0xD98(), params_00_00_00_FF, 0, roomid, 0);
fn_80080960(cam->getField_0xD98(), params_00_00_00_FF, 0, mRoomID, 0);
}
delayFrames = 0;
}
src/REL/d/t/d_t_gekotag.cpp
+3 -2
View File
@@ -75,8 +75,9 @@ void dTgGekoTag::doExecute() {
for (int i = 0; i < mNumGeko; i++) {
if (mRefs[i].get() == nullptr) {
if (mTimer2 == 0) {
dAcObjBase_c *b =
dAcObjBase_c::create(fProfile::E_GEKO, roomid, gekoParm, &mPosition, &gekoRot, nullptr, 0xFFFFFFFF);
dAcObjBase_c *b = dAcObjBase_c::create(
fProfile::E_GEKO, mRoomID, gekoParm, &mPosition, &gekoRot, nullptr, 0xFFFFFFFF
);
if (b != nullptr) {
mRefs[i].link(static_cast<dAcEgeko_c *>(b));
src/REL/d/t/d_t_genki_dws_tgt.cpp
+5 -5
View File
@@ -16,7 +16,7 @@ int dTgGenkiDwsTgt_c::create() {
u16 flag = getSceneFlagFromParams();
if (flag < 0xFF) {
bool flagSet = SceneflagManager::sInstance->checkFlag(roomid, flag);
bool flagSet = SceneflagManager::sInstance->checkFlag(mRoomID, flag);
if (flagSet) {
return FAILED;
}
@@ -24,9 +24,9 @@ int dTgGenkiDwsTgt_c::create() {
return FAILED;
}
int roomId_tmp = roomid;
int roomId_tmp = mRoomID;
if (addActorToRoom(-1)) {
roomid = roomId_tmp;
mRoomID = roomId_tmp;
changeLoadedEntitiesWithSet();
} else {
return FAILED;
@@ -46,12 +46,12 @@ int dTgGenkiDwsTgt_c::doDelete() {
}
int dTgGenkiDwsTgt_c::actorExecute() {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, getSceneFlagFromParams());
bool flag = SceneflagManager::sInstance->checkFlag(mRoomID, getSceneFlagFromParams());
if (flag) {
deleteRequest();
} else {
if (dStage_c::GetInstance() != nullptr) {
dRoom_c *room = dStage_c::GetInstance()->getRoom(roomid);
dRoom_c *room = dStage_c::GetInstance()->getRoom(mRoomID);
if (room != nullptr) {
if (room->checkFlag(8)) {
mDowsingTarget.doRegister();
src/REL/d/t/d_t_reaction.cpp
+10 -10
View File
@@ -41,7 +41,7 @@ int dTgReaction_c::create() {
if (getSceneFlag() >= 0xFF) {
return FAILED;
}
if (SceneflagManager::sInstance->checkBoolFlag(roomid, getSceneFlag())) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, getSceneFlag())) {
return FAILED;
}
}
@@ -49,7 +49,7 @@ int dTgReaction_c::create() {
field_0x4E0 = mRotation.x & 0xFF;
mRotation.x = angle.x = 0;
if (field_0x4E0 < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, field_0x4E0)) {
if (field_0x4E0 < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, field_0x4E0)) {
return FAILED;
}
@@ -127,7 +127,7 @@ int dTgReaction_c::doDelete() {
}
int dTgReaction_c::actorExecute() {
if (SceneflagManager::sInstance->checkBoolFlag(roomid, getSceneFlag())) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, getSceneFlag())) {
onDelete();
return SUCCEEDED;
} else {
@@ -169,7 +169,7 @@ void dTgReaction_c::checkForBonkItem() {
c2 += c;
c2.y += field_0x4E4;
u32 newItemParms = dAcItem_c::createItemParams(ITEM_HEART_PIECE, 1, 0, getSceneFlag(), 1, 0xFF);
if (dAcObjBase_c::create(fProfile::ITEM, roomid, newItemParms, &c2, nullptr, nullptr, 0xFFFFFFFF)) {
if (dAcObjBase_c::create(fProfile::ITEM, mRoomID, newItemParms, &c2, nullptr, nullptr, 0xFFFFFFFF)) {
field_0x4DD = 1;
onDelete();
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_READ_RIDDLE_A);
@@ -196,7 +196,7 @@ void dTgReaction_c::checkForBonkItem() {
if (fn_578_DB0(pos, uVar3)) {
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_READ_RIDDLE_B);
}
SceneflagManager::sInstance->setFlag(roomid, getSceneFlag());
SceneflagManager::sInstance->setFlag(mRoomID, getSceneFlag());
onDelete();
}
}
@@ -206,7 +206,7 @@ void dTgReaction_c::checkForBubble() {
if (mCollision.ChkTgHit() && mCollision.ChkTgAtHitType(AT_TYPE_BUBBLE)) {
if (dAcPy_c::LINK != nullptr && dAcPy_c::LINK->checkFlags0x350(0x40)) {
mVec3_c spawnPos = mPosition;
dAcObjBase_c::create(fProfile::OBJ_BUBBLE, roomid, 0x4, &spawnPos, nullptr, nullptr, 0xFFFFFFFF);
dAcObjBase_c::create(fProfile::OBJ_BUBBLE, mRoomID, 0x4, &spawnPos, nullptr, nullptr, 0xFFFFFFFF);
}
}
mCollision.SetC(mPosition);
@@ -230,7 +230,7 @@ void dTgReaction_c::checkForSlingBellowsItem() {
if (fn_578_DB0(spawnPos, uVar3)) {
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_READ_RIDDLE_B);
}
SceneflagManager::sInstance->setFlag(roomid, getSceneFlag());
SceneflagManager::sInstance->setFlag(mRoomID, getSceneFlag());
onDelete();
}
mCollision.SetC(mPosition);
@@ -275,11 +275,11 @@ bool dTgReaction_c::spawnHearts(s32 params, const mVec3_c &pos, s32 velocity_typ
for (int i = 0; i < numHearts; i++) {
ang.y = mAng(step) + cM::rndRange(rndMin, rndMax);
if (velocity_type == 5) {
dAcItem_c::spawnItem(ITEM_HEART, roomid, pos, ang, 0xFFFFFFFF, 1);
dAcItem_c::spawnItem(ITEM_HEART, mRoomID, pos, ang, 0xFFFFFFFF, 1);
} else if (velocity_type == 6) {
dAcItem_c::spawnItem(ITEM_HEART, roomid, pos, ang, 0xFFFFFFFF, 0);
dAcItem_c::spawnItem(ITEM_HEART, mRoomID, pos, ang, 0xFFFFFFFF, 0);
} else {
dAcItem_c::spawnDrop(ITEM_HEART, roomid, pos, ang);
dAcItem_c::spawnDrop(ITEM_HEART, mRoomID, pos, ang);
}
step = mAng(step) - stepSize;
}
src/REL/d/t/d_t_rock_boat.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ int dTgRockBoat_c::draw() {
void dTgRockBoat_c::initializeState_Wait() {}
void dTgRockBoat_c::executeState_Wait() {
if (cooldown > 0 && --cooldown == 0) {
dAcObjBase_c::create(fProfile::OBJ_ROCK_BOAT, roomid, (boatNum << 0x1c) | 0xff, &mPosition, 0, 0, -1);
dAcObjBase_c::create(fProfile::OBJ_ROCK_BOAT, mRoomID, (boatNum << 0x1c) | 0xff, &mPosition, 0, 0, -1);
cooldown = 0x259;
if (++boatNum == 0xf) {
boatNum = 0;
src/REL/d/t/d_t_ship_window.cpp
+17 -17
View File
@@ -15,11 +15,11 @@ int dTgShipWindow_c::create() {
mOnEventId = (mParams >> 24) & 0xFF;
mAlwaysPlayEvent = mRotation.x & 1;
mRotation.x = 0;
if (SceneflagManager::sInstance->checkBoolFlag(roomid, mInitialStateFlag)) {
SceneflagManager::sInstance->setFlag(roomid, mOutputStateFlagBase);
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mInitialStateFlag)) {
SceneflagManager::sInstance->setFlag(mRoomID, mOutputStateFlagBase);
mStateMgr.changeState(StateID_On);
} else {
SceneflagManager::sInstance->unsetFlag(roomid, mOutputStateFlagBase);
SceneflagManager::sInstance->unsetFlag(mRoomID, mOutputStateFlagBase);
mStateMgr.changeState(StateID_Off);
}
return SUCCEEDED;
@@ -43,9 +43,9 @@ int dTgShipWindow_c::actorExecuteInEvent() {
case 'act1':
actorExecute();
if (*mStateMgr.getStateID() == StateID_Off) {
SceneflagManager::sInstance->unsetFlag(roomid, mOutputStateFlagBase);
SceneflagManager::sInstance->unsetFlag(mRoomID, mOutputStateFlagBase);
} else {
SceneflagManager::sInstance->setFlag(roomid, mOutputStateFlagBase);
SceneflagManager::sInstance->setFlag(mRoomID, mOutputStateFlagBase);
}
mEvent.advanceNext();
break;
@@ -62,13 +62,13 @@ int dTgShipWindow_c::draw() {
void dTgShipWindow_c::initializeState_Off() {}
void dTgShipWindow_c::executeState_Off() {
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, mInitialStateFlag)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mInitialStateFlag)) {
return;
}
if ((mHasPlayedOffEvent == 0 || mAlwaysPlayEvent == 0) &&
(mOutputStateFlagBase >= 0xFF ||
!SceneflagManager::sInstance->checkBoolFlag(roomid, mOutputStateFlagBase + 1))) {
!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOutputStateFlagBase + 1))) {
if (mOffEventId != 0xFF) {
{
// this works but I don't like it
@@ -76,7 +76,7 @@ void dTgShipWindow_c::executeState_Off() {
static u32 FLAGS_2 = 0x00100001;
u32 f1 = FLAGS_1;
u32 f2 = FLAGS_2;
Event e = Event(mOffEventId, roomid, f2 & ~f1, nullptr, nullptr);
Event e = Event(mOffEventId, mRoomID, f2 & ~f1, nullptr, nullptr);
mEvent.scheduleEvent(e, 0);
}
@@ -85,30 +85,30 @@ void dTgShipWindow_c::executeState_Off() {
}
mHasPlayedOffEvent = 1;
if (mOutputStateFlagBase < 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, mOutputStateFlagBase + 1);
SceneflagManager::sInstance->setFlag(mRoomID, mOutputStateFlagBase + 1);
}
mStateMgr.changeState(StateID_On);
return;
} else {
SceneflagManager::sInstance->setFlag(roomid, mOutputStateFlagBase);
SceneflagManager::sInstance->setFlag(mRoomID, mOutputStateFlagBase);
mStateMgr.changeState(StateID_On);
return;
}
}
SceneflagManager::sInstance->setFlag(roomid, mOutputStateFlagBase);
SceneflagManager::sInstance->setFlag(mRoomID, mOutputStateFlagBase);
mStateMgr.changeState(StateID_On);
}
void dTgShipWindow_c::finalizeState_Off() {}
void dTgShipWindow_c::initializeState_On() {}
void dTgShipWindow_c::executeState_On() {
if (SceneflagManager::sInstance->checkBoolFlag(roomid, mInitialStateFlag)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mInitialStateFlag)) {
return;
}
if ((mHasPlayedOnEvent == 0 || mAlwaysPlayEvent == 0) &&
(mOutputStateFlagBase >= 0xFF ||
!SceneflagManager::sInstance->checkBoolFlag(roomid, mOutputStateFlagBase + 2))) {
!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOutputStateFlagBase + 2))) {
if (mOnEventId != 0xFF) {
{
// this works but I don't like it
@@ -116,7 +116,7 @@ void dTgShipWindow_c::executeState_On() {
static u32 FLAGS_2 = 0x00100001;
u32 f1 = FLAGS_1;
u32 f2 = FLAGS_2;
Event e = Event(mOnEventId, roomid, f2 & ~f1, nullptr, nullptr);
Event e = Event(mOnEventId, mRoomID, f2 & ~f1, nullptr, nullptr);
mEvent.scheduleEvent(e, 0);
}
@@ -125,17 +125,17 @@ void dTgShipWindow_c::executeState_On() {
}
mHasPlayedOnEvent = 1;
if (mOutputStateFlagBase < 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, mOutputStateFlagBase + 2);
SceneflagManager::sInstance->setFlag(mRoomID, mOutputStateFlagBase + 2);
}
mStateMgr.changeState(StateID_Off);
return;
} else {
SceneflagManager::sInstance->unsetFlag(roomid, mOutputStateFlagBase);
SceneflagManager::sInstance->unsetFlag(mRoomID, mOutputStateFlagBase);
mStateMgr.changeState(StateID_Off);
return;
}
}
SceneflagManager::sInstance->unsetFlag(roomid, mOutputStateFlagBase);
SceneflagManager::sInstance->unsetFlag(mRoomID, mOutputStateFlagBase);
mStateMgr.changeState(StateID_Off);
}
void dTgShipWindow_c::finalizeState_On() {}
src/REL/d/t/d_t_sound_area.cpp
+2 -2
View File
@@ -18,7 +18,7 @@ void float_ordering() {
int dTgSndAr_c::create() {
mScale *= 0.01f;
if (dTgSndMg_c::GetInstance() == nullptr) {
dAcObjBase_c::createActorUnkGroup3(fProfile::SOUND_AREA_MGR, roomid, 0, nullptr, nullptr, nullptr, -1);
dAcObjBase_c::createActorUnkGroup3(fProfile::SOUND_AREA_MGR, mRoomID, 0, nullptr, nullptr, nullptr, -1);
}
switch (getTypeFromParams()) {
@@ -27,7 +27,7 @@ int dTgSndAr_c::create() {
mtx.YrotM(mRotation.y);
PSMTXInverse(mtx.m, mtx.m);
break;
case 3: mRail.initWithPathIndex(mParams >> 8 & 0xFF, roomid, 0); break;
case 3: mRail.initWithPathIndex(mParams >> 8 & 0xFF, mRoomID, 0); break;
}
fBase_c *base = nullptr;
src/REL/d/t/d_t_sound_area_mgr.cpp
+2 -3
View File
@@ -2,13 +2,12 @@
#include "d/a/d_a_player.h"
SPECIAL_ACTOR_PROFILE(SOUND_AREA_MGR, dTgSndMg_c, fProfile::SOUND_AREA_MGR, 0x0145, 0, 0);
int dTgSndMg_c::create() {
s8 tmpRoomId = roomid;
s8 tmpRoomId = mRoomID;
addActorToRoom(-1);
roomid = tmpRoomId;
mRoomID = tmpRoomId;
return SUCCEEDED;
}
src/REL/d/t/d_t_sw_area.cpp
+4 -4
View File
@@ -33,8 +33,8 @@ bool isValidStoryFlag(u16 storyflag) {
int dTgSwArea_c::actorExecute() {
if (checkIfVec3fInMatrix(area, dAcPy_c::LINK->mPosition)) {
SceneflagManager::sInstance->setFlag(roomid, setSceneflag);
SceneflagManager::sInstance->unsetFlag(roomid, unsetSceneflag);
SceneflagManager::sInstance->setFlag(mRoomID, setSceneflag);
SceneflagManager::sInstance->unsetFlag(mRoomID, unsetSceneflag);
if (isValidStoryFlag(setStoryflag)) {
StoryflagManager::sInstance->setFlag(setStoryflag);
@@ -55,8 +55,8 @@ int dTgSwArea_c::actorExecute() {
}
if (isTemporary) {
SceneflagManager::sInstance->unsetFlag(roomid, setSceneflag);
SceneflagManager::sInstance->setFlag(roomid, unsetSceneflag);
SceneflagManager::sInstance->unsetFlag(mRoomID, setSceneflag);
SceneflagManager::sInstance->setFlag(mRoomID, unsetSceneflag);
if (isValidStoryFlag(setStoryflag)) {
StoryflagManager::sInstance->unsetFlag(setStoryflag);
src/REL/d/t/d_t_telop.cpp
+3 -3
View File
@@ -22,16 +22,16 @@ int dTgTelop_c::actorExecute() {
return SUCCEEDED;
}
if (mTempflag != 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mTempflag)) {
if (mTempflag != 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mTempflag)) {
return SUCCEEDED;
}
if (mSceneflag != 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mSceneflag)) {
if (mSceneflag != 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag)) {
return SUCCEEDED;
}
if (mTempflag != 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, mTempflag);
SceneflagManager::sInstance->setFlag(mRoomID, mTempflag);
}
dLytAreaCaption_c::setArea(mArea);
src/REL/d/t/d_t_time_area_check.cpp
+9 -9
View File
@@ -16,20 +16,20 @@ int dTgTimeAreaCheck_c::doDelete() {
}
int dTgTimeAreaCheck_c::actorExecute() {
f32 result = dTimeAreaMgr_c::GetInstance()->checkPositionIsInPastState(roomid, mPosition, nullptr, 10.0f);
f32 result = dTimeAreaMgr_c::GetInstance()->checkPositionIsInPastState(mRoomID, mPosition, nullptr, 10.0f);
if (result > 0.0f) {
if (mPastSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mPastSceneFlag)) {
SceneflagManager::sInstance->setFlag(roomid, mPastSceneFlag);
if (mPastSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mPastSceneFlag)) {
SceneflagManager::sInstance->setFlag(mRoomID, mPastSceneFlag);
}
if (mPresentSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mPresentSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(roomid, mPresentSceneFlag);
if (mPresentSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mPresentSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mPresentSceneFlag);
}
} else {
if (mPastSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mPastSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(roomid, mPastSceneFlag);
if (mPastSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mPastSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mPastSceneFlag);
}
if (mPresentSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mPresentSceneFlag)) {
SceneflagManager::sInstance->setFlag(roomid, mPresentSceneFlag);
if (mPresentSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mPresentSceneFlag)) {
SceneflagManager::sInstance->setFlag(mRoomID, mPresentSceneFlag);
}
}
return SUCCEEDED;
src/REL/d/t/d_t_timer.cpp
+2 -2
View File
@@ -30,10 +30,10 @@ int dTgTimer_c::create() {
}
int dTgTimer_c::actorExecute() {
bool getFlag = SceneflagManager::sInstance->checkFlag(roomid, getCheckSceneflag());
bool getFlag = SceneflagManager::sInstance->checkFlag(mRoomID, getCheckSceneflag());
if (getFlag) {
if (checkShouldTrigger()) {
SceneflagManager::sInstance->setFlag(roomid, getSetSceneflag());
SceneflagManager::sInstance->setFlag(mRoomID, getSetSceneflag());
} else {
incrementTimer();
}
src/REL/d/t/d_t_touch.cpp
+6 -6
View File
@@ -28,8 +28,8 @@ int dTgTouchTag::doDelete() {
}
int dTgTouchTag::actorExecute() {
if (mChkFlag != 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mChkFlag)) {
SceneflagManager::sInstance->unsetFlag(roomid, mZoneFlag);
if (mChkFlag != 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mChkFlag)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mZoneFlag);
return SUCCEEDED;
}
@@ -48,10 +48,10 @@ void dTgTouchTag::executeState_Wait() {
dAcBase_c *actor = static_cast<dAcBase_c *>(fManager_c::searchBaseByProfName(ACTIVATORS[mActivatorIndex], nullptr));
while (actor != nullptr) {
if (actor->roomid == roomid && checkIfVec3fInMatrix(mAreaOfEffect, actor->mPosition)) {
if (actor->mRoomID == mRoomID && checkIfVec3fInMatrix(mAreaOfEffect, actor->mPosition)) {
mFlagTimer = 5;
if (mZoneFlag != 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, mZoneFlag);
SceneflagManager::sInstance->setFlag(mRoomID, mZoneFlag);
}
break;
}
@@ -60,8 +60,8 @@ void dTgTouchTag::executeState_Wait() {
}
if (sLib::calcTimer(&mFlagTimer) == 0) {
if (mZoneFlag != 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mZoneFlag)) {
SceneflagManager::sInstance->unsetFlag(roomid, mZoneFlag);
if (mZoneFlag != 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mZoneFlag)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mZoneFlag);
}
}
}
src/d/a/d_a_base.cpp
+15 -13
View File
@@ -54,7 +54,7 @@ dAcBase_c::dAcBase_c()
mObjID(s_Create_UnkFlags),
mViewClipIdx(s_Create_ViewClipIdx),
mActorNode(nullptr),
roomid(s_Create_RoomId),
mRoomID(s_Create_RoomId),
mActorSubtype(s_Create_Subtype) {
JStudio_actor = 0;
someStr[0] = 0;
@@ -142,9 +142,9 @@ bool dAcBase_c::addActorToRoom(s32 roomId) {
}
if (setConnectChild(room)) {
if (roomId == -1) {
this->roomid = dStage_c::GetInstance()->getCurrRoomId();
this->mRoomID = dStage_c::GetInstance()->getCurrRoomId();
} else {
this->roomid = roomId;
this->mRoomID = roomId;
}
return true;
}
@@ -180,7 +180,7 @@ void dAcBase_c::postCreate(fBase_c::MAIN_STATE_e state) {
if (state == SUCCESS) {
mPositionCopy = mPosition;
mRotationCopy = mRotation;
mRoomIDCopy = roomid;
mRoomIDCopy = mRoomID;
}
dBase_c::postCreate(state);
}
@@ -299,7 +299,7 @@ void dAcBase_c::unkVirtFunc_0x60() {
// 8002ceb0
// loads f2 before f0 instead of f0 then f2
bool dAcBase_c::restorePosRotFromCopy() {
if (roomid != mRoomIDCopy) {
if (mRoomID != mRoomIDCopy) {
return 0;
}
mPosition = mPositionCopy;
@@ -320,7 +320,9 @@ u32 dAcBase_c::itemDroppingAndGivingRelated(mVec3_c *spawnPos, int subtype) {
u32 param2Copy = mParams2;
mParams2 = param2Copy | 0xFF000000;
// mAng3_c rot = {};
return SpecialItemDropMgr::GetInstance()->giveSpecialDropItem(param2Copy >> 0x18, roomid, spawnPos, subtype, 0, -1);
return SpecialItemDropMgr::GetInstance()->giveSpecialDropItem(
param2Copy >> 0x18, mRoomID, spawnPos, subtype, 0, -1
);
}
// 8002cf90
@@ -500,16 +502,16 @@ void dAcBase_c::updateRoomId(f32 yOffset) {
mVec3_c actorPos(mPosition.x, mPosition.y + yOffset, mPosition.z);
if (dBgS_ObjGndChk::CheckPos(actorPos)) {
roomid = dBgS_ObjGndChk::GetRoomID();
mRoomID = dBgS_ObjGndChk::GetRoomID();
} else {
roomid = dStage_c::GetInstance()->getCurrRoomId();
mRoomID = dStage_c::GetInstance()->getCurrRoomId();
}
}
}
// 8002d540
bool dAcBase_c::isRoomFlags_0x6_Set() {
dRoom_c *room = dStage_c::GetInstance()->getRoom(roomid);
dRoom_c *room = dStage_c::GetInstance()->getRoom(mRoomID);
return (room->checkFlag(0x4 | 0x2));
}
@@ -673,7 +675,7 @@ dAcBase_c *dAcBase_c::createActor(
}
if (actorRoomid == 63) {
actorRoomid = roomid;
actorRoomid = mRoomID;
}
u32 newParams2 = actorParams2 != 0 ? getParams2_ignoreLower() : -1;
@@ -681,7 +683,7 @@ dAcBase_c *dAcBase_c::createActor(
setTempCreateParams(
actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, -1, nullptr
);
dBase_c *room = dStage_c::getParentForRoom(roomid);
dBase_c *room = dStage_c::getParentForRoom(mRoomID);
return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, ACTOR);
}
@@ -704,7 +706,7 @@ dAcBase_c *dAcBase_c::createActorStage(
}
if (actorRoomid == 63) {
actorRoomid = roomid;
actorRoomid = mRoomID;
}
u32 newParams2 = actorParams2 != 0 ? getParams2_ignoreLower() : -1;
@@ -712,7 +714,7 @@ dAcBase_c *dAcBase_c::createActorStage(
setTempCreateParams(
actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, -1, nullptr
);
dBase_c *room = dStage_c::getParentForRoom(roomid);
dBase_c *room = dStage_c::getParentForRoom(mRoomID);
return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, STAGE);
}
src/d/a/d_a_salbage_obj.cpp
+1 -1
View File
@@ -320,7 +320,7 @@ void dAcSalbageObj_c::executeState_Wait() {
if (dSalvageMgr_c::sInstance->getCurrentSalvageObjId() != mSalvageIf.getSalvageObjId()) {
if (!dSalvageMgr_c::sInstance->mSlbRef.isLinked()) {
mVec3_c pos(mPosition.x, mPosition.y + 100000.0f, mPosition.z);
dAcObjBase_c::create(fProfile::NPC_SLB, roomid, 0xFFFFFD01, &pos, nullptr, nullptr, -1);
dAcObjBase_c::create(fProfile::NPC_SLB, mRoomID, 0xFFFFFD01, &pos, nullptr, nullptr, -1);
}
if (dSalvageMgr_c::sInstance->startedQuestForSalvageObj(this)) {
src/d/a/obj/d_a_obj_boomerang.cpp
+3 -3
View File
@@ -262,9 +262,9 @@ int dAcBoomerang_c::doDelete() {
void dAcBoomerang_c::setRoomId() {
if (mAcch.GetGroundH() != 1e-9f) {
roomid = dBgS::GetInstance()->GetRoomId(mAcch.GetGnd());
} else if (roomid == -1) {
roomid = dAcPy_c::GetLink2()->roomid;
mRoomID = dBgS::GetInstance()->GetRoomId(mAcch.GetGnd());
} else if (mRoomID == -1) {
mRoomID = dAcPy_c::GetLink2()->mRoomID;
}
}
src/d/a/obj/d_a_obj_switch.cpp
+12 -12
View File
@@ -102,7 +102,7 @@ int dAcOsw_c::actorCreate() {
mButtonCtrl.init(node.GetID());
if (mOffSceneFlag >= 0xFF) {
mStateMgr.changeState(StateID_None);
} else if (SceneflagManager::sInstance->checkBoolFlag(roomid, mOffSceneFlag)) {
} else if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOffSceneFlag)) {
mStateMgr.changeState(StateID_OffWait);
} else {
mStateMgr.changeState(StateID_OnWait);
@@ -114,7 +114,7 @@ int dAcOsw_c::actorCreate() {
int dAcOsw_c::actorPostCreate() {
if (mCanBeSeen) {
field_0x5A0.check(roomid, mPosition, 0, 30.0f, 0.1f);
field_0x5A0.check(mRoomID, mPosition, 0, 30.0f, 0.1f);
if (field_0x5A0.field_0x00 <= 0.0f) {
mHidden = true;
mScale.set(0.0f, 0.0f, 0.0f);
@@ -141,9 +141,9 @@ int dAcOsw_c::actorPostCreate() {
int dAcOsw_c::doDelete() {
dAcPy_c *link = dAcPy_c::LINK;
if (mSwitchType != 1 && field_0x5F2 == 0) {
if ((link == nullptr || link->checkFlags0x340(0x200)) && (link == nullptr || link->roomid == roomid)) {
if (mOffSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mOffSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(roomid, mOffSceneFlag);
if ((link == nullptr || link->checkFlags0x340(0x200)) && (link == nullptr || link->mRoomID == mRoomID)) {
if (mOffSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOffSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mOffSceneFlag);
}
}
}
@@ -153,7 +153,7 @@ int dAcOsw_c::doDelete() {
int dAcOsw_c::actorExecute() {
mStateMgr.executeState();
if (mCanBeSeen) {
field_0x5A0.check(roomid, mPosition, 0, 30.0f, 0.1f);
field_0x5A0.check(mRoomID, mPosition, 0, 30.0f, 0.1f);
if (field_0x5A0.field_0x00 <= 0.0f) {
if (mScale.x >= 1.0f) {
if (!mHidden) {
@@ -214,12 +214,12 @@ int dAcOsw_c::draw() {
bool dAcOsw_c::someInteractCheck(bool activatedByPlayer) {
mActivatedByPlayer = activatedByPlayer;
field_0x5F3 = 1;
return SceneflagManager::sInstance->checkBoolFlag(roomid, mOffSceneFlag);
return SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOffSceneFlag);
}
void dAcOsw_c::initializeState_OnWait() {
if (mOffSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mOffSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(roomid, mOffSceneFlag);
if (mOffSceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOffSceneFlag)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mOffSceneFlag);
}
}
void dAcOsw_c::executeState_OnWait() {
@@ -238,7 +238,7 @@ void dAcOsw_c::executeState_OnWait() {
} else {
if (field_0x5F3 != 0) {
bool doIt = false;
if ((mOnSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mOnSceneFlag))) {
if ((mOnSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOnSceneFlag))) {
doIt = true;
}
if (!doIt) {
@@ -264,8 +264,8 @@ void dAcOsw_c::finalizeState_On() {
}
void dAcOsw_c::initializeState_OffWait() {
if (mOffSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mOffSceneFlag)) {
SceneflagManager::sInstance->setFlag(roomid, mOffSceneFlag);
if (mOffSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mOffSceneFlag)) {
SceneflagManager::sInstance->setFlag(mRoomID, mOffSceneFlag);
}
field_0x5EC = 30;
mButtonCtrl.mElevation = -20.0f;
src/d/a/obj/d_a_obj_tbox.cpp
+8 -8
View File
@@ -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) {
src/d/d_linkage.cpp
+1 -1
View File
@@ -241,7 +241,7 @@ void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) {
mtx.ZXYrotM(pActor->mRotation);
if (mControllingActor.p_owner) {
pActor->roomid = static_cast<dAcObjBase_c *>(mControllingActor.p_owner)->roomid;
pActor->mRoomID = static_cast<dAcObjBase_c *>(mControllingActor.p_owner)->mRoomID;
}
}
src/d/lyt/meter/d_lyt_meter_plus_btn.cpp
+3 -3
View File
@@ -253,12 +253,12 @@ bool dLytMeterPlusBtn_c::hasSpecificMapMark() {
switch (mark->shift0_0x3) {
case 0: {
mark->field_0x10D = mark->shift4_0x8 < 0xFF &&
SceneflagManager::sInstance->checkBoolFlag(mark->roomid, mark->shift4_0x8);
SceneflagManager::sInstance->checkBoolFlag(mark->mRoomID, mark->shift4_0x8);
break;
}
case 1: {
mark->field_0x10D = mark->shift4_0x8 < 0xFF &&
!SceneflagManager::sInstance->checkBoolFlag(mark->roomid, mark->shift4_0x8);
!SceneflagManager::sInstance->checkBoolFlag(mark->mRoomID, mark->shift4_0x8);
break;
}
case 3: {
@@ -284,7 +284,7 @@ bool dLytMeterPlusBtn_c::hasSpecificMapMark() {
mark->field_0x10E = mark->field_0x10C && mark->field_0x10D;
if (mark->shift23_0x8 < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mark->roomid, mark->shift23_0x8)) {
if (mark->shift23_0x8 < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mark->mRoomID, mark->shift23_0x8)) {
mark->field_0x10E = !mark->field_0x10E;
if (mark->rotz_shift12_0x3 != 0) {
mark->field_0x10E = false;
src/d/snd/d_snd_source.cpp
+1 -1
View File
@@ -584,7 +584,7 @@ bool dSoundSource_c::startVoiceLine(const char *label) {
}
s32 dSoundSource_c::getRoomId() const {
return mpActor->roomid;
return mpActor->mRoomID;
}
void dSoundSource_c::stopSounds(u32 soundId, s32 fadeFrames) {
src/d/snd/d_snd_source_npc_head.cpp
+1 -2
View File
@@ -16,7 +16,7 @@ dSndSourceNpcHead_c::dSndSourceNpcHead_c(
s32 sourceType, dAcBase_c *ac, const char *name, dSndSourceGroup_c *pOwnerGroup
)
: dSoundSource_c(sourceType, ac, name, pOwnerGroup), field_0x15C(0) {
if (dSndStateMgr_c::isInStage("F001r") && streq(name, "NpcCbFdHead") && ac->roomid == 1) {
if (dSndStateMgr_c::isInStage("F001r") && streq(name, "NpcCbFdHead") && ac->mRoomID == 1) {
// Fledge in Knight's Academy
pOwnerGroup->getAmbientParam()->field_0x00 = 100.0f;
pOwnerGroup->getAmbientParam()->field_0x04 = 300.0f;
@@ -73,7 +73,6 @@ bool dSndSourceNpcHead_c::vt_0xDC(u32 id) {
return npcSpeak(id);
}
void dSndSourceNpcHead_c::setOrigName(const char *arg) {
mpOrigName = arg;
mpMainName = arg;
src/d/tg/d_t_switch.cpp
+17 -17
View File
@@ -36,13 +36,13 @@ int dTgSw_c::create() {
}
if (dScGame_c::isCurrentStage("D201")) {
if (roomid == 4) {
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, 0x2F)) {
SceneflagManager::sInstance->unsetFlag(roomid, mSetSceneFlagId);
if (mRoomID == 4) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, 0x2F)) {
SceneflagManager::sInstance->unsetFlag(mRoomID, mSetSceneFlagId);
resetAllSwitches();
const u8 *flag = D201_BossKeyPuzzleFlags;
for (u32 i = 0; i < 4; i++) {
SceneflagManager::sInstance->unsetFlag(roomid, *flag);
SceneflagManager::sInstance->unsetFlag(mRoomID, *flag);
flag++;
}
}
@@ -50,7 +50,7 @@ int dTgSw_c::create() {
}
}
bool b = SceneflagManager::sInstance->checkUncommittedFlag(roomid, mSetSceneFlagId);
bool b = SceneflagManager::sInstance->checkUncommittedFlag(mRoomID, mSetSceneFlagId);
mStateMgr.changeState(!b ? StateID_OnWait : StateID_OffWait);
return SUCCEEDED;
}
@@ -70,34 +70,34 @@ int dTgSw_c::draw() {
void dTgSw_c::resetAllSwitches() {
for (int i = mTrigSceneFlagIdBegin; i < mTrigSceneFlagIdBegin + mTrigSceneFlagIdEnd; i++) {
SceneflagManager::sInstance->unsetFlag(roomid, i);
SceneflagManager::sInstance->unsetFlag(mRoomID, i);
}
mCurrentFlagPosition = 0;
}
void dTgSw_c::resetSwitchesAfterCurrent() {
for (int i = mTrigSceneFlagIdBegin + mCurrentFlagPosition; i < mTrigSceneFlagIdBegin + mTrigSceneFlagIdEnd; i++) {
SceneflagManager::sInstance->unsetFlag(roomid, i);
SceneflagManager::sInstance->unsetFlag(mRoomID, i);
}
}
bool dTgSw_c::isPuzzleSolved() {
for (int i = 0; i < mCurrentFlagPosition; i++) {
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, mTrigSceneFlagIdBegin + i)) {
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mTrigSceneFlagIdBegin + i)) {
mCurrentFlagPosition = i;
field_0x192 = 1;
}
}
if (field_0x192 == 0 &&
SceneflagManager::sInstance->checkBoolFlag(roomid, mTrigSceneFlagIdBegin + mCurrentFlagPosition)) {
SceneflagManager::sInstance->checkBoolFlag(mRoomID, mTrigSceneFlagIdBegin + mCurrentFlagPosition)) {
mCurrentFlagPosition++;
}
s32 numCorrectFlags = mCurrentFlagPosition;
for (int i = mCurrentFlagPosition; i < mTrigSceneFlagIdEnd; i++) {
int t = i < mNumSwitchesToWin ? i : mNumSwitchesToWin;
if (SceneflagManager::sInstance->checkBoolFlag(roomid, mTrigSceneFlagIdBegin + t)) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, mTrigSceneFlagIdBegin + t)) {
field_0x192 = 1;
numCorrectFlags++;
}
@@ -107,11 +107,11 @@ bool dTgSw_c::isPuzzleSolved() {
}
bool dTgSw_c::isLmfBossKeyPuzzle() {
return dScGame_c::isCurrentStage("D300_1") && roomid == 8 && mSetSceneFlagId == 0x1C;
return dScGame_c::isCurrentStage("D300_1") && mRoomID == 8 && mSetSceneFlagId == 0x1C;
}
void dTgSw_c::initializeState_OnWait() {
SceneflagManager::sInstance->unsetFlag(roomid, mSetSceneFlagId);
SceneflagManager::sInstance->unsetFlag(mRoomID, mSetSceneFlagId);
field_0x192 = 0;
}
void dTgSw_c::executeState_OnWait() {
@@ -150,14 +150,14 @@ void dTgSw_c::executeState_On() {
void dTgSw_c::finalizeState_On() {}
void dTgSw_c::initializeState_OffWait() {
if (!SceneflagManager::sInstance->checkBoolFlag(roomid, mSetSceneFlagId) && isLmfBossKeyPuzzle()) {
SceneflagManager::sInstance->setFlag(roomid, 0xC0);
if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSetSceneFlagId) && isLmfBossKeyPuzzle()) {
SceneflagManager::sInstance->setFlag(mRoomID, 0xC0);
}
SceneflagManager::sInstance->setFlag(roomid, mSetSceneFlagId);
SceneflagManager::sInstance->setFlag(mRoomID, mSetSceneFlagId);
}
void dTgSw_c::executeState_OffWait() {
if (mFirst2 == 1 && !isPuzzleSolved()) {
SceneflagManager::sInstance->unsetFlag(roomid, mSetSceneFlagId);
SceneflagManager::sInstance->unsetFlag(mRoomID, mSetSceneFlagId);
mStateMgr.changeState(StateID_Off);
}
}
@@ -180,7 +180,7 @@ void dTgSw_c::executeState_Off() {
}
if (isLmfBossKeyPuzzle()) {
SceneflagManager::sInstance->setFlag(roomid, 0xC1);
SceneflagManager::sInstance->setFlag(mRoomID, 0xC1);
}
mStateMgr.changeState(StateID_OnWait);
}