Merge branch 'miami' into lcs
# Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp # src/audio/PolRadio.cpp # src/control/CarCtrl.cpp
This commit is contained in:
@@ -146,7 +146,13 @@ enum
|
||||
CHANNEL_MISSION_AUDIO_1,
|
||||
CHANNEL_MISSION_AUDIO_2,
|
||||
CHANNEL_PLAYER_VEHICLE_ENGINE,
|
||||
NUM_CHANNELS
|
||||
NUM_CHANNELS,
|
||||
|
||||
NUM_CHANNELS_DTS_GENERIC = 18,
|
||||
CHANNEL_DTS_POLICE_RADIO = NUM_CHANNELS_DTS_GENERIC,
|
||||
CHANNEL_DTS_MISSION_AUDIO_1,
|
||||
CHANNEL_DTS_MISSION_AUDIO_2,
|
||||
CHANNEL_DTS_PLAYER_VEHICLE_ENGINE,
|
||||
};
|
||||
#else
|
||||
enum
|
||||
|
||||
Reference in New Issue
Block a user