From da253837d162686627c64f0faaedd5549db444da Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sat, 25 Jan 2020 12:41:22 +0200 Subject: audio stuff Collision audio and police radio stuff moved to a separate cpp's like in the original code cPoliceRadioQueue added, code refactored correspondingly cAudioManager::ServiceCollisions reversed PlayOneShotScriptObject reversed cAudioScriptObject moved to AudioScriptObject.cpp Fixed use of numbers on non-integer types (bools, pointers) enum is now used for ped audio calculation Added fixes for vehicle description in the police radio (missing vehicles and wrong colors) --- src/core/Pools.h | 4 ++-- src/core/Wanted.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/Pools.h b/src/core/Pools.h index 770a1de1..862062ee 100644 --- a/src/core/Pools.h +++ b/src/core/Pools.h @@ -8,7 +8,7 @@ #include "PlayerPed.h" #include "Automobile.h" #include "DummyPed.h" -#include "AudioManager.h" +#include "AudioScriptObject.h" typedef CPool CCPtrNodePool; typedef CPool CEntryInfoNodePool; @@ -18,7 +18,7 @@ typedef CPool CBuildingPool; typedef CPool CTreadablePool; typedef CPool CObjectPool; typedef CPool CDummyPool; -typedef CPool CAudioScriptObjectPool; +typedef CPool CAudioScriptObjectPool; class CPools { diff --git a/src/core/Wanted.h b/src/core/Wanted.h index 15bff1a5..c908a4e5 100644 --- a/src/core/Wanted.h +++ b/src/core/Wanted.h @@ -22,6 +22,7 @@ enum eCrimeType CRIME_COP_BURNED, CRIME_VEHICLE_BURNED, CRIME_DESTROYED_CESSNA, + NUM_CRIME_TYPES }; class CCrimeBeingQd -- cgit v1.2.3