merge

src/core/World.cpp

@@ -952,7 +952,7 @@ CWorld::RemoveEntityInsteadOfProcessingIt(CEntity* ent)
 		if (FindPlayerPed() == ent)
 			Remove(ent);
 		else
-			CPopulation::RemovePed(ent);
+			CPopulation::RemovePed((CPed*)ent);
 	} else {
 		Remove(ent);
 		delete ent;

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;
 };
 

src/core/config.h

@@ -93,6 +93,8 @@ enum Config {
 
 	NUMPEDROUTES = 200,
 	NUMPHONES = 50,
+	NUMPEDGROUPS = 31,
+	NUMMODELSPERPEDGROUP = 8,
 
 	NUMVISIBLEENTITIES = 2000,
 	NUMINVISIBLEENTITIES = 150,