Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts: # src/audio/AudioManager.cpp # src/core/Radar.cpp
2021-08-29 08:58:54 +03:00
parent 2a69f34f93 8ef1e29a5c
commit 2be8fcfa64
8 changed files with 79 additions and 60 deletions
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -129,7 +129,6 @@ enum Config {
 	NUMINVISIBLEENTITIES = 150,

 	NUM_AUDIOENTITY_EVENTS = 4,
-	NUM_PED_COMMENTS_BANKS = 2,
 	NUM_PED_COMMENTS_SLOTS = 20,

 	NUM_SOUND_QUEUES = 2,