diff options
| author | aap <aap@papnet.eu> | 2020-04-16 09:23:31 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-04-16 09:23:31 +0200 |
| commit | 89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d (patch) | |
| tree | cbecbce7d638d7175ea4ee5c8b402c00564c017e /src/render | |
| parent | Merge branch 'master' of github.com:gtamodding/re3 (diff) | |
| parent | Merge pull request #453 from Fire-Head/master (diff) | |
| download | re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.gz re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.bz2 re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.lz re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.xz re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.zst re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/render/Hud.cpp | 6 | ||||
| -rw-r--r-- | src/weapons/WeaponEffects.cpp (renamed from src/render/WeaponEffects.cpp) | 0 | ||||
| -rw-r--r-- | src/weapons/WeaponEffects.h (renamed from src/render/WeaponEffects.h) | 0 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index f8b86bd2..9529c4c1 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -144,12 +144,10 @@ void CHud::Draw() float fMultBright = SpriteBrightness * 0.03f * (0.25f * fStep + 0.75f); CRect rect; if (DrawCrossHairPC && TheCamera.Cams[TheCamera.ActiveCam].Using3rdPersonMouseCam()) { -#ifndef ASPECT_RATIO_SCALE float f3rdX = SCREEN_WIDTH * TheCamera.m_f3rdPersonCHairMultX; float f3rdY = SCREEN_HEIGHT * TheCamera.m_f3rdPersonCHairMultY; -#else - float f3rdX = (((TheCamera.m_f3rdPersonCHairMultX - 0.5f) / ((CDraw::GetAspectRatio()) / (DEFAULT_ASPECT_RATIO))) + 0.5f) * SCREEN_WIDTH; - float f3rdY = SCREEN_HEIGHT * TheCamera.m_f3rdPersonCHairMultY + SCREEN_SCALE_Y(-2.0f); +#ifdef ASPECT_RATIO_SCALE + f3rdY -= SCREEN_SCALE_Y(2.0f); #endif if (FindPlayerPed() && WeaponType == WEAPONTYPE_M16) { rect.left = f3rdX - SCREEN_SCALE_X(32.0f * 0.6f); diff --git a/src/render/WeaponEffects.cpp b/src/weapons/WeaponEffects.cpp index 2ed9e662..2ed9e662 100644 --- a/src/render/WeaponEffects.cpp +++ b/src/weapons/WeaponEffects.cpp diff --git a/src/render/WeaponEffects.h b/src/weapons/WeaponEffects.h index 31c5a309..31c5a309 100644 --- a/src/render/WeaponEffects.h +++ b/src/weapons/WeaponEffects.h |