merge with upstream

src/core/config.h

@@ -3,8 +3,8 @@
 enum Config {
 	NUMPLAYERS = 1,
 
-	NUMCDIMAGES = 12,	// gta3.img duplicates (not used on PC)
-	MAX_CDIMAGES = 8,	// additional cdimages
+	NUMCDIMAGES = 12, // gta3.img duplicates (not used on PC)
+	MAX_CDIMAGES = 8, // additional cdimages
 	MAX_CDCHANNELS = 5,
 
 	MODELINFOSIZE = 5500,
@@ -22,15 +22,15 @@ enum Config {
 	XTRACOMPSMODELSIZE = 2,
 	TWODFXSIZE = 2000,
 
-	MAXVEHICLESLOADED = 50,	// 70 on mobile
+	MAXVEHICLESLOADED = 50, // 70 on mobile
 
 	NUMOBJECTINFO = 168, // object.dat
 
 	// Pool sizes
 	NUMPTRNODES = 30000,  // 26000 on PS2
 	NUMENTRYINFOS = 5400, // 3200 on PS2
-	NUMPEDS = 140,		  // 90 on PS2
-	NUMVEHICLES = 110,	// 70 on PS2
+	NUMPEDS = 140,        // 90 on PS2
+	NUMVEHICLES = 110,    // 70 on PS2
 	NUMBUILDINGS = 5500,  // 4915 on PS2
 	NUMTREADABLES = 1214,
 	NUMOBJECTS = 450,
@@ -94,6 +94,8 @@ enum Config {
 	NUM_GARAGES = 32,
 	NUM_PROJECTILES = 32,
 
+	NUM_WATERCANNONS = 3,
+
 	NUMPEDROUTES = 200,
 	NUMPHONES = 50,
 	NUMPEDGROUPS = 31,
@@ -102,7 +104,16 @@ enum Config {
 	NUMVISIBLEENTITIES = 2000,
 	NUMINVISIBLEENTITIES = 150,
 
-	NUM_CONSOLEMESSAGES = 8
+	NUM_AUDIOENTITY_EVENTS = 4,
+	NUM_PED_COMMENTS_BANKS = 2,
+	NUM_PED_COMMENTS_SLOTS = 20,
+
+	NUM_SOUNDS_SAMPLES_BANKS = 2,
+	NUM_SOUNDS_SAMPLES_SLOTS = 27,
+	NUM_AUDIOENTITIES = 200,
+
+	NUM_AUDIO_REFLECTIONS = 5,
+	NUM_SCRIPT_MAX_ENTITIES = 40,
 };
 
 // We'll use this once we're ready to become independent of the game