mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-11 22:50:06 -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: