Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

setCameraFieldOfView improvements #4325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FileEX wants to merge 10 commits into multitheftauto:master
base: master
Choose a base branch
Loading
from FileEX:bugfix/camera_fov_modes
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
assert checks
  • Loading branch information
FileEX committed Aug 10, 2025
commit c5d2586567f4f6f61adefe6c3a5b51d76fff0a96
22 changes: 20 additions & 2 deletions Client/game_sa/CSettingsSA.cpp
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,18 +525,24 @@ float CSettingsSA::GetFieldOfViewVehicleMax()
float CSettingsSA::GetFieldOfViewAiming()
{
CCamera* camera = pGame->GetCamera();
assert(camera);

CCam* cam = camera->GetCam(camera->GetActiveCam());
eCamMode cameraViewMode = static_cast<eCamMode>(camera->GetCam(camera->GetActiveCam())->GetMode());
assert(cam);

eCamMode cameraViewMode = static_cast<eCamMode>(camera->GetCam(camera->GetActiveCam())->GetMode());
return (cameraViewMode == MODE_AIMWEAPON || cameraViewMode == MODE_AIMWEAPON_FROMCAR || cameraViewMode == MODE_AIMWEAPON_ATTACHED) ? cam->GetFOV() : ms_fovAiming;
}

float CSettingsSA::GetFieldOfViewSniperAiming()
{
CCamera* camera = pGame->GetCamera();
assert(camera);

CCam* cam = camera->GetCam(camera->GetActiveCam());
eCamMode cameraViewMode = static_cast<eCamMode>(camera->GetCam(camera->GetActiveCam())->GetMode());
assert(cam);

eCamMode cameraViewMode = static_cast<eCamMode>(camera->GetCam(camera->GetActiveCam())->GetMode());
return (cameraViewMode == MODE_SNIPER) ? cam->GetFOV() : ms_fovSniperAiming;
}

Expand Down Expand Up @@ -719,7 +725,11 @@ bool CSettingsSA::SetFieldOfViewAiming(float angle, bool fromScript)
return false;

CCamera* camera = pGame->GetCamera();
assert(camera);

CCam* cam = camera->GetCam(camera->GetActiveCam());
assert(cam);

eCamMode cameraViewMode = static_cast<eCamMode>(cam->GetMode());

if (cameraViewMode != MODE_AIMWEAPON && cameraViewMode != MODE_AIMWEAPON_FROMCAR && cameraViewMode != MODE_AIMWEAPON_ATTACHED)
Expand All @@ -738,7 +748,11 @@ bool CSettingsSA::SetFieldOfViewSniperAiming(float angle, bool fromScript)
return false;

CCamera* camera = pGame->GetCamera();
assert(camera);

CCam* cam = camera->GetCam(camera->GetActiveCam());
assert(cam);

eCamMode cameraViewMode = static_cast<eCamMode>(cam->GetMode());

if (!ms_fovSniperAimingFromScript && fromScript)
Expand Down Expand Up @@ -776,7 +790,11 @@ bool CSettingsSA::SetFieldOfView1stPersonAiming(float angle, bool fromScript)
return false;

CCamera* camera = pGame->GetCamera();
assert(camera);

CCam* cam = camera->GetCam(camera->GetActiveCam());
assert(cam);

eCamMode cameraViewMode = static_cast<eCamMode>(cam->GetMode());

if (!ms_fov1stPersonAimingFromScript && fromScript)
Expand Down
Loading

AltStyle によって変換されたページ (->オリジナル) /