summaryrefslogtreecommitdiff
path: root/src/d/d_stage.cpp
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-12-02 15:53:02 -0800
committerJasper St. Pierre <jstpierre@mecheye.net>2023-12-02 15:53:02 -0800
commit33277110069ac1f4d812052bb6ae9aa3f18b6bdb (patch)
tree8f68dc1d33c32155bc51b804368f928cd3f9cdb8 /src/d/d_stage.cpp
parentaf144f369a46e544c4c9bb25a11c6d701a5c7582 (diff)
d_attention work
Diffstat (limited to 'src/d/d_stage.cpp')
-rw-r--r--src/d/d_stage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 9ba33635..948f491a 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -218,7 +218,7 @@ bool dStage_roomControl_c::checkRoomDisp(int i_roomNo) const {
/* 80040E6C-80040FD8 .text loadRoom__20dStage_roomControl_cFiPUc */
int dStage_roomControl_c::loadRoom(int roomCount, u8* rooms) {
for (int roomNo = 0; roomNo < ARRAY_SIZE(mStatus); roomNo++) {
- if (dStage_roomControl_c::checkStatusFlag(roomNo, 0x02 | 0x04)) {
+ if (checkStatusFlag(roomNo, 0x02 | 0x04)) {
return 0;
}
}
@@ -227,7 +227,7 @@ int dStage_roomControl_c::loadRoom(int roomCount, u8* rooms) {
for (int roomNo = 0; roomNo < (int)ARRAY_SIZE(mStatus); roomNo++) {
if (dStage_roomControl_c::checkStatusFlag(roomNo, 0x01)) {
if (!stayRoomCheck(roomCount, rooms, roomNo)) {
- dStage_roomControl_c::onStatusFlag(roomNo, 0x04);
+ onStatusFlag(roomNo, 0x04);
r26 = FALSE;
}
}
@@ -239,10 +239,10 @@ int dStage_roomControl_c::loadRoom(int roomCount, u8* rooms) {
for (int i = 0; i < roomCount; i++) {
u8 roomNo = dStage_roomRead_dt_c_GetLoadRoomIndex(rooms[i]);
dStage_roomControl_c::setZoneCount(roomNo, 2);
- if (!dStage_roomControl_c::checkStatusFlag(roomNo, 0x01)) {
+ if (!checkStatusFlag(roomNo, 0x01)) {
if (createRoomScene(roomNo)) {
u8 flag = dStage_roomRead_dt_c_ChkBg(rooms[i]) ? 0x02 : 0x0A;
- dStage_roomControl_c::onStatusFlag(roomNo, flag);
+ onStatusFlag(roomNo, flag);
}
return TRUE;
}