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

Merge remote-tracking branch 'aap/lcs' into lcs

Browse Source 
# Conflicts:
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
This commit is contained in:
Sergeanur
2021-08-12 11:45:25 +03:00
parent 9a1b826021 621f941ff7
commit ec22576e49
8 changed files with 218 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/peds/Ped.cpp
View File

@ -307,6 +307,10 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
bDonePositionOutOfCollision = false;
bCanAttackPlayerWithCops = false;
bDropsWeaponsOnDeath = false;
b1A4_2 = true;
bAttacksPlayerWithCops = false;
if (CGeneral::GetRandomNumber() & 3)
bHasACamera = false;
else

2
src/peds/Ped.h
View File

@ -587,7 +587,7 @@ public:
uint16 m_gangFlags; // <- this one is uint16
uint8 bDropsWeaponsOnDeath : 1;
uint8 b1A4_2 : 1;
uint8 b1A4_2 : 1; // something to do with car hostages
uint8 bAttacksPlayerWithCops : 1;
uint8 b1A4_8 : 1;
uint8 b1A4_10 : 1;