archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-07 12:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami

Browse Source
This commit is contained in:
Roman Masanin
2020-09-13 21:45:53 +03:00
parent aa2f1b6b29 25a22cc6f2
commit 8f948228d5
25 changed files with 2007 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/audio/AudioLogic.cpp
View File

@ -294,6 +294,18 @@ cAudioManager::CalculateDistance(bool &distCalculated, float dist)
}
}
CVehicle *cAudioManager::FindVehicleOfPlayer()
{
CVehicle* vehicle = FindPlayerVehicle();
CPlayerPed* ped = FindPlayerPed();
if (vehicle == nil && ped != nil) {
CEntity *attachedTo = ped->m_attachedTo;
if (attachedTo && attachedTo->IsVehicle())
vehicle = (CVehicle*)attachedTo;
}
return vehicle;
}
void
cAudioManager::ProcessSpecial()
{
@ -3976,6 +3988,25 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
}
}
void
cAudioManager::SetPedTalkingStatus(CPed *ped, uint8 status)
{
if (ped != nil)
ped->m_canTalk = status;
}
void
cAudioManager::SetPlayersMood(uint8 mood, int32 time)
{
if (!m_bIsInitialised) return;
if (mood < MAX_PLAYER_MOODS) {
m_nPlayerMood = mood;
m_nPlayerMoodTimer = CTimer::GetTimeInMilliseconds() + time;
}
}
void
cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
{