archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-07 00:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

script full

Browse Source
This commit is contained in:
Nikolay Korolev
2021-01-18 22:19:30 +03:00
parent 9001a64ef9
commit c09297997e
27 changed files with 1666 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/peds/Ped.h
View File

@ -527,7 +527,7 @@ public:
uint32 bOnlyAllowedToSitInFront : 1;
uint32 b1A1_8 : 1;
uint32 b1A1_10 : 1;
uint32 b1A1_20 : 1;
uint32 bOverrideMoveAnim : 1;
#ifdef KANGAROO_CHEAT
// our own flags
@ -536,16 +536,16 @@ public:
uint16 m_gangFlags; // <- this one is uint16
uint8 b1A4_1 : 1;
uint8 bDropsWeaponsOnDeath : 1;
uint8 b1A4_2 : 1;
uint8 b1A4_4 : 1;
uint8 bAttacksPlayerWithCops : 1;
uint8 b1A4_8 : 1;
uint8 b1A4_10 : 1;
uint8 b1A4_20 : 1;
uint8 b1A4_40 : 1;
uint8 b1A4_80 : 1;
uint8 b1A5_1 : 1;
uint8 bCanBeTargettedByLeader : 1;
uint8 b1A5_2 : 1;
uint8 b1A5_4 : 1;
uint8 b1A5_8 : 1;
@ -605,6 +605,8 @@ public:
float m_fHealth;
float m_fArmour;
uint32 m_nExtendedRangeTimer;
uint32 m_nScriptShootTimer;
uint32 m_nScriptAttackTimer;
int16 m_routeLastPoint;
uint16 m_routeStartPoint;
int16 m_routePointsPassed;
@ -704,6 +706,7 @@ public:
uint32 m_lastComment;
CVector m_vecSpotToGuard;
float m_radiusToGuard;
float m_fMaxHealth;
static void *operator new(size_t);
static void *operator new(size_t, int);

2
src/peds/PedAI.cpp
View File

@ -6488,7 +6488,7 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith
}
}
if (m_pedInObjective->IsPlayer() && m_nPedType != PEDTYPE_COP
&& CharCreatedBy != MISSION_CHAR && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) {
&& CharCreatedBy != MISSION_CHAR && FindPlayerPed()->m_pWanted->m_CurrentCops != 0/* TODO: && !bAttacksPlayerWithCops*/) {
SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE);
return CANT_ATTACK;