summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-02 10:39:23 +0100
committeraap <aap@papnet.eu>2020-12-02 10:39:23 +0100
commit11720568336fcba184d14a254781b660d09c0a21 (patch)
treeae3b60dc640cf2f2a08fca242ca8bbe29d9cb2c3
parentcAudioManager::ProcessPedOneShots + fixes (diff)
downloadre3-11720568336fcba184d14a254781b660d09c0a21.tar
re3-11720568336fcba184d14a254781b660d09c0a21.tar.gz
re3-11720568336fcba184d14a254781b660d09c0a21.tar.bz2
re3-11720568336fcba184d14a254781b660d09c0a21.tar.lz
re3-11720568336fcba184d14a254781b660d09c0a21.tar.xz
re3-11720568336fcba184d14a254781b660d09c0a21.tar.zst
re3-11720568336fcba184d14a254781b660d09c0a21.zip
-rw-r--r--src/control/PathFind.cpp8
-rw-r--r--src/core/Camera.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 41dc735f..e10693eb 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1766,10 +1766,18 @@ CPathFind::TestCoorsCloseness(CVector target, uint8 type, CVector start)
DoPathSearch(type, start, -1, target, pNodeList, &DummyResult, 32, nil, &dist, 999999.88f, -1);
else
DoPathSearch(type, start, -1, target, nil, &DummyResult2, 0, nil, &dist, 50.0f, -1);
+#ifdef FIX_BUGS
+ // dist has GenerationDistMultiplier as a factor, so our reference dist should have it too
+ if(type == PATH_CAR)
+ return dist < 150.0f*TheCamera.GenerationDistMultiplier;
+ else
+ return dist < 100.0f*TheCamera.GenerationDistMultiplier;
+#else
if(type == PATH_CAR)
return dist < 150.0f;
else
return dist < 100.0f;
+#endif
}
void
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 68771f64..06e72dfc 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -612,7 +612,7 @@ CCamera::Process(void)
// LOD dist
if(!CCutsceneMgr::IsRunning() || CCutsceneMgr::UseLodMultiplier()){
- LODDistMultiplier = 70.0f/CDraw::GetFOV() * CDraw::GetAspectRatio()/(4.0f/3.0f);
+ LODDistMultiplier = 70.0f/CDraw::GetFOV();
if(GetPosition().z > 55.0f && FindPlayerVehicle() && FindPlayerVehicle()->pHandling->Flags & (HANDLING_IS_HELI|HANDLING_IS_PLANE) ||
FindPlayerPed()->m_attachedTo){