diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 12:38:21 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 12:38:21 +0200 |
| commit | 9cc12018928b73acccd575970a6e4dbcb5b460ac (patch) | |
| tree | a9ffaccca16aa71da94212e4810eee8fb15a1d19 /src/peds | |
| parent | lcs bridge (diff) | |
| parent | Merge pull request #1266 from Nick007J/miami (diff) | |
| download | re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.gz re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.bz2 re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.lz re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.xz re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.zst re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 2 | ||||
| -rw-r--r-- | src/peds/Population.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index dc143098..f0c1c4fb 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -287,7 +287,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) bHeadStuckInCollision = false; bDeadPedInFrontOfCar = false; - m_gangFlags = 0xFF; + m_gangFlags = ~0; bStayInCarOnJack = false; diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index 75c454b6..cf3a195c 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -40,8 +40,8 @@ bool CPopulation::ms_bGivePedsWeapons; int32 CPopulation::m_AllRandomPedsThisType = -1; float CPopulation::PedDensityMultiplier = 1.0f; uint32 CPopulation::ms_nTotalMissionPeds; -int32 CPopulation::MaxNumberOfPedsInUse = 25; -int32 CPopulation::MaxNumberOfPedsInUseInterior = 40; +int32 CPopulation::MaxNumberOfPedsInUse = DEFAULT_MAX_NUMBER_OF_PEDS; +int32 CPopulation::MaxNumberOfPedsInUseInterior = DEFAULT_MAX_NUMBER_OF_PEDS_INTERIOR; uint32 CPopulation::ms_nNumCivMale; uint32 CPopulation::ms_nNumCivFemale; uint32 CPopulation::ms_nNumCop; @@ -1095,6 +1095,7 @@ CPopulation::ManagePopulation(void) } float dist = (ped->GetPosition() - playerPos).Magnitude2D(); + bool pedIsFarAway = false; if (ped->IsGangMember()) |