From ff92b822b673e77c9fa9af6ecbab5745a6ff01d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Sun, 16 Feb 2020 05:15:58 +0300 Subject: CPopulation 1 --- src/core/World.cpp | 2 +- src/core/config.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/World.cpp b/src/core/World.cpp index c914b647..9c1678e1 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -949,7 +949,7 @@ CWorld::RemoveEntityInsteadOfProcessingIt(CEntity* ent) if (FindPlayerPed() == ent) Remove(ent); else - CPopulation::RemovePed(ent); + CPopulation::RemovePed((CPed*)ent); } else { Remove(ent); delete ent; diff --git a/src/core/config.h b/src/core/config.h index de96ad1b..0ff1809c 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -93,6 +93,8 @@ enum Config { NUMPEDROUTES = 200, NUMPHONES = 50, + NUMPEDGROUPS = 31, + NUMMODELSPERPEDGROUP = 8, NUMVISIBLEENTITIES = 2000, NUMINVISIBLEENTITIES = 150, -- cgit v1.2.3 From 090aef7de7672c2649570eeff5cc5b68a371e723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Tue, 18 Feb 2020 02:56:13 +0300 Subject: CPopulation 2 --- src/core/Zones.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/Zones.h b/src/core/Zones.h index bf3957de..76855e8b 100644 --- a/src/core/Zones.h +++ b/src/core/Zones.h @@ -1,6 +1,7 @@ #pragma once #include "Game.h" +#include "Gangs.h" enum eZoneType { @@ -38,12 +39,12 @@ public: int16 carDensity; int16 carThreshold[6]; int16 copThreshold; - int16 gangThreshold[9]; + int16 gangThreshold[NUM_GANGS]; // Ped data uint16 pedDensity; uint16 copDensity; - uint16 gangDensity[9]; + uint16 gangDensity[NUM_GANGS]; uint16 pedGroup; }; -- cgit v1.2.3