mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-18 21:47:41 -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
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);
}