mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-01 09:47:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

sword -> meleeWeapon (#1147)

Browse Source
This commit is contained in:
Dragorn421
2022-02-21 00:45:12 +01:00
committed by GitHub
parent b9cc31dc74
commit 145b14dbc4
24 changed files with 194 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_camera.c
+1 -1
View File
@@ -2928,7 +2928,7 @@ s32 Camera_Battle1(Camera* camera) {
}
anim->roll += (((OREG(36) * camera->speedRatio) * (1.0f - distRatio)) - anim->roll) * PCT(OREG(37));
camera->roll = DEGF_TO_BINANG(anim->roll);
camera->fov = Camera_LERPCeilF((player->swordState != 0 ? 0.8f
camera->fov = Camera_LERPCeilF((player->meleeWeaponState != 0 ? 0.8f
: gSaveContext.health <= 0x10 ? 0.8f
: 1.0f) *
(fov - ((fov * 0.05f) * distRatio)),