diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-02-21 00:45:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 18:45:12 -0500 |
| commit | 145b14dbc4eeabe2547d458de7bbd3fffd446190 (patch) | |
| tree | d10bb4f01284760323b562359c5f0d1fe20ca168 /src/code/z_camera.c | |
| parent | b9cc31dc74bd3472375ae06412ace007c8f46534 (diff) | |
sword -> meleeWeapon (#1147)
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 62cc90acf..68f2d4244 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -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)), |