From c982700a699b1f4cdc0eb7e49239658c5dba2124 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 13 Jul 2021 01:00:00 +0300 Subject: [PATCH 1/4] Enable cutscene shadows --- src/core/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/config.h b/src/core/config.h index bdc8d534..244794d5 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -319,7 +319,7 @@ enum Config { #define WATER_CHEATS //#define USE_CUTSCENE_SHADOW_FOR_PED -#define DISABLE_CUTSCENE_SHADOWS +//#define DISABLE_CUTSCENE_SHADOWS // Pad #if !defined(RW_GL3) && defined(_WIN32) From 523b23339cd761d934501dcbcc059d131b5a28c4 Mon Sep 17 00:00:00 2001 From: withmorten Date: Tue, 13 Jul 2021 00:21:11 +0200 Subject: [PATCH 2/4] disable USE_CUTSCENE_SHADOW_FOR_PED if COMPATIBLE_SAVES isn't defined --- src/core/config.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/config.h b/src/core/config.h index 244794d5..9c318350 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -318,7 +318,7 @@ enum Config { #undef PC_WATER #define WATER_CHEATS -//#define USE_CUTSCENE_SHADOW_FOR_PED +//#define USE_CUTSCENE_SHADOW_FOR_PED // requires COMPATIBLE_SAVES //#define DISABLE_CUTSCENE_SHADOWS // Pad @@ -451,4 +451,9 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually #undef PS2_AUDIO_CHANNELS #endif +// if these defines are enabled saves are not vanilla compatible without COMPATIBLE_SAVES +#ifndef COMPATIBLE_SAVES +#undef USE_CUTSCENE_SHADOW_FOR_PED +#endif + #endif // VANILLA_DEFINES From fb5a207abcdf7b76fdb719b46c5c706deb7026fa Mon Sep 17 00:00:00 2001 From: Magnus Larsen Date: Mon, 12 Jul 2021 23:51:28 -0700 Subject: [PATCH 3/4] Fix NearPed count going negative --- src/peds/Ped.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 7fe2520d..cad10d8a 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -421,6 +421,7 @@ CPed::~CPed(void) nearPed->m_nearPeds[k] = nearPed->m_nearPeds[k + 1]; nearPed->m_nearPeds[k + 1] = nil; } + nearPed->m_nearPeds[ARRAY_SIZE(m_nearPeds) - 1] = nil; nearPed->m_numNearPeds--; } else j++; From 02c4ada807887975d5c61b510e05d2c689118282 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Thu, 15 Jul 2021 00:49:46 +0300 Subject: [PATCH 4/4] Remove stupid cast --- src/core/Fire.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp index 8a6db0da..57315b15 100644 --- a/src/core/Fire.cpp +++ b/src/core/Fire.cpp @@ -457,7 +457,7 @@ CFireManager::StartScriptFire(const CVector &pos, CEntity *target, float strengt if (target) { if (target->IsPed()) { ped->m_pFire = fire; - if (target != (CVehicle *)FindPlayerPed()) { + if (target != FindPlayerPed()) { CVector2D pos = target->GetPosition(); ped->SetFlee(pos, 10000); ped->SetMoveAnim();