summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/World.cpp2
-rw-r--r--src/core/Zones.h5
-rw-r--r--src/core/config.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index c6236f42..f97f0ebf 100644
--- a/src/core/World.cpp
+++ b/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;
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;
};
diff --git a/src/core/config.h b/src/core/config.h
index 770b51e6..faad34b9 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,