Merge branch 'miami' into lcs

# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
This commit is contained in:
Sergeanur
2021-08-20 14:34:11 +03:00
6 changed files with 670 additions and 647 deletions

View File

@@ -135,7 +135,7 @@ CBoat::ProcessControl(void)
m_fBuoyancy *= 0.99f;
#ifdef FIX_BUGS
if(FindPlayerPed() && FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 && GetModelIndex() == MI_PREDATOR){
if(FindPlayerPed() && FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 && GetModelIndex() == MI_PREDATOR && pDriver && IsPolicePedModel(pDriver->GetModelIndex())) {
#else
if(FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 && GetModelIndex() == MI_PREDATOR){
#endif