diff options
| author | mzxrules <mzxrules@gmail.com> | 2024-10-14 15:23:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-14 15:23:50 -0400 |
| commit | 2f54db142e5a4fbb29607508fe6e7d9f813c8974 (patch) | |
| tree | 601f3d40a607a334ac4e4ed2555f9c572ef89553 /src/code/z_camera.c | |
| parent | d0b47258693aa2a9c0bf885ca93bf21841bdbab9 (diff) | |
Rename RoomBehaviorType1 to RoomType (#2271)
* Rename RoomBehaviorType1 to RoomType
* suggestions
* Update include/z64scene.h
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 4281b15c0..5a6986dc8 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -7540,18 +7540,18 @@ void func_80057FC4(Camera* camera) { camera->prevSetting = camera->setting = CAM_SET_FREE0; camera->stateFlags &= ~CAM_STATE_CHECK_BG; } else if (camera->play->roomCtx.curRoom.roomShape->base.type != ROOM_SHAPE_TYPE_IMAGE) { - switch (camera->play->roomCtx.curRoom.behaviorType1) { - case ROOM_BEHAVIOR_TYPE1_1: + switch (camera->play->roomCtx.curRoom.type) { + case ROOM_TYPE_DUNGEON: Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10); camera->prevSetting = camera->setting = CAM_SET_DUNGEON0; break; - case ROOM_BEHAVIOR_TYPE1_0: + case ROOM_TYPE_NORMAL: PRINTF("camera: room type: default set field\n"); Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10); camera->prevSetting = camera->setting = CAM_SET_NORMAL0; break; default: - PRINTF("camera: room type: default set etc (%d)\n", camera->play->roomCtx.curRoom.behaviorType1); + PRINTF("camera: room type: default set etc (%d)\n", camera->play->roomCtx.curRoom.type); Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10); camera->prevSetting = camera->setting = CAM_SET_NORMAL0; camera->stateFlags |= CAM_STATE_CHECK_BG; @@ -8466,7 +8466,7 @@ s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange break; case CAM_REQUEST_MODE_SFX_ATTENTION: - if (camera->play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) { + if (camera->play->roomCtx.curRoom.type == ROOM_TYPE_DUNGEON) { Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY); } else { Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON); |