archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-02-24 18:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source
This commit is contained in:
Sergeanur 2021-07-15 00:51:01 +03:00
commit 3377709c4b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Fire.cpp
View File

@ -457,7 +457,7 @@ CFireManager::StartScriptFire(const CVector &pos, CEntity *target, float strengt
if (target) { if (target) {
if (target->IsPed()) { if (target->IsPed()) {
ped->m_pFire = fire; ped->m_pFire = fire;
if (target != (CVehicle *)FindPlayerPed()) { if (target != FindPlayerPed()) {
CVector2D pos = target->GetPosition(); CVector2D pos = target->GetPosition();
ped->SetFlee(pos, 10000); ped->SetFlee(pos, 10000);
ped->SetMoveAnim(); ped->SetMoveAnim();

9
src/core/config.h
View File

@ -322,8 +322,8 @@ enum Config {
#define WATER_CHEATS #define WATER_CHEATS
//#define PSP_WATERCANNON //#define PSP_WATERCANNON
//#define USE_CUTSCENE_SHADOW_FOR_PED //#define USE_CUTSCENE_SHADOW_FOR_PED // requires COMPATIBLE_SAVES
#define DISABLE_CUTSCENE_SHADOWS //#define DISABLE_CUTSCENE_SHADOWS
// Pad // Pad
#if !defined(RW_GL3) && defined(_WIN32) #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 #undef PS2_AUDIO_CHANNELS
#endif #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 #endif // VANILLA_DEFINES

1
src/peds/Ped.cpp
View File

@ -421,6 +421,7 @@ CPed::~CPed(void)
nearPed->m_nearPeds[k] = nearPed->m_nearPeds[k + 1]; nearPed->m_nearPeds[k] = nearPed->m_nearPeds[k + 1];
nearPed->m_nearPeds[k + 1] = nil; nearPed->m_nearPeds[k + 1] = nil;
} }
nearPed->m_nearPeds[ARRAY_SIZE(m_nearPeds) - 1] = nil;
nearPed->m_numNearPeds--; nearPed->m_numNearPeds--;
} else } else
j++; j++;