mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 12:54:40 +00:00
Code Issues Projects Releases Wiki Activity

Rename RoomBehaviorType1 to RoomType (#2271)

Browse source 
* Rename RoomBehaviorType1 to RoomType

* suggestions

* Update include/z64scene.h

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mzxrules 2024-10-14 15:23:50 -04:00 • committed by GitHub
parent d0b4725869
commit 2f54db142e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/code/z_camera.c
View file

@ -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);