From 361808923a099674d7af6701670ecb90d905c337 Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 13 Jan 2021 14:16:38 +0100 Subject: arrest cam fixes --- src/core/Cam.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index 731537ef..d8c66279 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -4346,7 +4346,7 @@ CCam::ProcessArrestCamOne(void) ((CPed*)TheCamera.pTargetEntity)->m_pedIK.GetComponentPosition(TargetPos, PED_MID); if(FindPlayerPed() && FindPlayerPed()->m_pArrestingCop) cop = FindPlayerPed()->m_pArrestingCop; - if(cop && CGeneral::GetRandomNumberInRange(0.0f, 0.1f) > 0.5f){ + if(cop && CGeneral::GetRandomNumberInRange(0.0f, 1.0f) > 0.5f){ ArrestModes[0] = ARRESTCAM_OVERSHOULDER; ArrestModes[1] = ARRESTCAM_ALONGGROUND; ArrestModes[2] = ARRESTCAM_OVERSHOULDER; @@ -4368,7 +4368,7 @@ CCam::ProcessArrestCamOne(void) if(FindPlayerPed() && FindPlayerPed()->m_pArrestingCop) cop = FindPlayerPed()->m_pArrestingCop; - if(cop && CGeneral::GetRandomNumberInRange(0.0f, 0.1f) > 0.65f){ + if(cop && CGeneral::GetRandomNumberInRange(0.0f, 1.0f) > 0.65f){ ArrestModes[0] = ARRESTCAM_OVERSHOULDER; ArrestModes[1] = ARRESTCAM_LAMPPOST; ArrestModes[2] = ARRESTCAM_ALONGGROUND; @@ -4438,6 +4438,7 @@ CCam::ProcessArrestCamOne(void) pStoredCopPed = nil; } + Source = CamSource; CVector OrigSource = Source; TheCamera.AvoidTheGeometry(OrigSource, TargetPos, Source, FOV); Front = TargetPos - Source; @@ -4464,8 +4465,9 @@ CCam::ProcessArrestCamOne(void) if(nUsingWhichCamera == ARRESTCAM_OVERSHOULDER && pStoredCopPed){ foundPos = GetLookOverShoulderPos(TheCamera.pTargetEntity, pStoredCopPed, TargetPos, CamSource); - if(CamSource.z > Source.z + ARRESTCAM_S_ROTATION_UP*CTimer::GetTimeStep()) - CamSource.z = Source.z + ARRESTCAM_S_ROTATION_UP*CTimer::GetTimeStep(); + float newZ = Source.z + ARRESTCAM_S_ROTATION_UP*CTimer::GetTimeStep(); + if(CamSource.z > newZ) + CamSource.z = newZ; }else if(nUsingWhichCamera >= ARRESTCAM_ALONGGROUND_RIGHT && nUsingWhichCamera <= ARRESTCAM_ALONGGROUND_LEFT_UP){ CamSource = Source; Front = TargetPos - CamSource; -- cgit v1.2.3 From 3a6935f126a9bdebe933578f66eaae208a0d6b5c Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 13 Jan 2021 20:39:00 +0100 Subject: fixed shoot through collision --- src/core/SurfaceTable.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core') diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h index cd08c843..8ff43106 100644 --- a/src/core/SurfaceTable.h +++ b/src/core/SurfaceTable.h @@ -81,6 +81,7 @@ inline bool IsShootThrough(uint8 surfType) { switch(surfType) + case SURFACE_TRANSPARENT_CLOTH: case SURFACE_METAL_CHAIN_FENCE: case SURFACE_TRANSPARENT_STONE: case SURFACE_SCAFFOLD_POLE: -- cgit v1.2.3 From c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Thu, 14 Jan 2021 22:06:27 +0100 Subject: More checks before autolinking --- src/core/Pad.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core') diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index feda19c6..8d55250a 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -10,6 +10,7 @@ #include "crossplatform.h" #include "platform.h" #ifdef XINPUT +#if defined _MSC_VER && !defined RE3_NO_AUTOLINK #include #if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1) #pragma comment( lib, "Xinput9_1_0.lib" ) @@ -17,6 +18,7 @@ #pragma comment( lib, "Xinput.lib" ) #endif #endif +#endif #include "Pad.h" #include "ControllerConfig.h" -- cgit v1.2.3 From 1082b138301767a73877af30509712f7c6f5f6ee Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Thu, 14 Jan 2021 22:15:36 +0100 Subject: RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK --- src/core/Pad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 8d55250a..757f0f50 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -10,7 +10,7 @@ #include "crossplatform.h" #include "platform.h" #ifdef XINPUT -#if defined _MSC_VER && !defined RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #include #if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1) #pragma comment( lib, "Xinput9_1_0.lib" ) -- cgit v1.2.3 From 5acbf9ef59cbfcd5b4a71f6a782b654417db1464 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Thu, 14 Jan 2021 22:20:40 +0100 Subject: fix --- src/core/Pad.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/core') diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 757f0f50..feda19c6 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -10,7 +10,6 @@ #include "crossplatform.h" #include "platform.h" #ifdef XINPUT -#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #include #if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1) #pragma comment( lib, "Xinput9_1_0.lib" ) @@ -18,7 +17,6 @@ #pragma comment( lib, "Xinput.lib" ) #endif #endif -#endif #include "Pad.h" #include "ControllerConfig.h" -- cgit v1.2.3