diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-14 23:51:01 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-14 23:51:01 +0200 |
| commit | 3377709c4b8d27599918beaa363e0eb40d2099a9 (patch) | |
| tree | 110127eb9a51737be58f542ac9dd695cc08795bb | |
| parent | Update GXT (diff) | |
| parent | Remove stupid cast (diff) | |
| download | re3-3377709c4b8d27599918beaa363e0eb40d2099a9.tar re3-3377709c4b8d27599918beaa363e0eb40d2099a9.tar.gz re3-3377709c4b8d27599918beaa363e0eb40d2099a9.tar.bz2 re3-3377709c4b8d27599918beaa363e0eb40d2099a9.tar.lz re3-3377709c4b8d27599918beaa363e0eb40d2099a9.tar.xz re3-3377709c4b8d27599918beaa363e0eb40d2099a9.tar.zst re3-3377709c4b8d27599918beaa363e0eb40d2099a9.zip | |
| -rw-r--r-- | src/core/Fire.cpp | 2 | ||||
| -rw-r--r-- | src/core/config.h | 9 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 1 |
3 files changed, 9 insertions, 3 deletions
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(); diff --git a/src/core/config.h b/src/core/config.h index 4eda549b..e491c317 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -322,8 +322,8 @@ enum Config { #define WATER_CHEATS //#define PSP_WATERCANNON -//#define USE_CUTSCENE_SHADOW_FOR_PED -#define DISABLE_CUTSCENE_SHADOWS +//#define USE_CUTSCENE_SHADOW_FOR_PED // requires COMPATIBLE_SAVES +//#define DISABLE_CUTSCENE_SHADOWS // Pad #if !defined(RW_GL3) && defined(_WIN32) @@ -455,4 +455,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 diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 8729ce26..9d261010 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++; |