diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 976ec0386..f58ae1adf 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -517,6 +517,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl targetCtx->activeCategory = actorCategory; targetCtx->unk_40 = 1.0f; + /* if (CVar_GetS32("gBlindMode", 0)) { u16 targetSound; @@ -554,6 +555,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl Audio_PlaySoundGeneral(targetSound, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } } + */ } if (unkActor == NULL) { diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 6435001c5..9c5f480b8 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -1619,16 +1619,18 @@ s32 Camera_Normal1(Camera* camera) { if (anim->startSwingTimer <= 0) { eyeAdjustment.pitch = atEyeNextGeo.pitch; - eyeAdjustment.yaw = + eyeAdjustment.yaw = CVar_GetS32("gBlindMode", 0) != 0 ? atEyeNextGeo.yaw + : Camera_LERPCeilS(anim->swingYawTarget, atEyeNextGeo.yaw, 1.0f / camera->yawUpdateRateInv, 0xA); } else if (anim->swing.unk_18 != 0) { - eyeAdjustment.yaw = + eyeAdjustment.yaw = CVar_GetS32("gBlindMode", 0) != 0 ? atEyeNextGeo.yaw + : Camera_LERPCeilS(anim->swing.unk_16, atEyeNextGeo.yaw, 1.0f / camera->yawUpdateRateInv, 0xA); eyeAdjustment.pitch = Camera_LERPCeilS(anim->swing.unk_14, atEyeNextGeo.pitch, 1.0f / camera->yawUpdateRateInv, 0xA); } else { // rotate yaw to follow player. - eyeAdjustment.yaw = + eyeAdjustment.yaw = Camera_CalcDefaultYaw(camera, atEyeNextGeo.yaw, camera->playerPosRot.rot.y, norm1->unk_14, sp94); eyeAdjustment.pitch = Camera_CalcDefaultPitch(camera, atEyeNextGeo.pitch, norm1->pitchTarget, anim->slopePitchAdj);