mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-25 20:35:40 +00:00
Code Issues Projects Releases Wiki Activity

Ped comments cleanup

Browse source
This commit is contained in:
Sergeanur 2020-05-25 19:10:15 +03:00
parent cebc3bbd48
commit ad896d5f81
1 changed files with 53 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
src/audio/AudioLogic.cpp
View file

@ -3975,17 +3975,18 @@ cAudioManager::GetCopTalkSfx(int16 sound)
PedState pedState; PedState pedState;
static uint32 lastSfx = NO_SAMPLE; static uint32 lastSfx = NO_SAMPLE;
if (sound == SOUND_PED_ARREST_COP) { switch (sound) {
case SOUND_PED_ARREST_COP:
GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_ARREST_1, 6); GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_ARREST_1, 6);
} else { break;
if (sound != SOUND_PED_PURSUIT_COP) { case SOUND_PED_PURSUIT_COP:
return GetGenericMaleTalkSfx(sound);
}
pedState = FindPlayerPed()->m_nPedState; pedState = FindPlayerPed()->m_nPedState;
if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
return NO_SAMPLE; return NO_SAMPLE;
GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_CHASE_1, 7); GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_CHASE_1, 7);
break;
default:
return GetGenericMaleTalkSfx(sound);
} }
return (SFX_COP_VOICE_2_ARREST_1 - SFX_COP_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5) + sfx; return (SFX_COP_VOICE_2_ARREST_1 - SFX_COP_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5) + sfx;
@ -3998,17 +3999,18 @@ cAudioManager::GetSwatTalkSfx(int16 sound)
PedState pedState; PedState pedState;
static uint32 lastSfx = NO_SAMPLE; static uint32 lastSfx = NO_SAMPLE;
if (sound == SOUND_PED_ARREST_SWAT) { switch (sound) {
case SOUND_PED_ARREST_SWAT:
GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6); GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6);
} else { break;
if (sound != SOUND_PED_PURSUIT_SWAT) { case SOUND_PED_PURSUIT_SWAT:
return GetGenericMaleTalkSfx(sound);
}
pedState = FindPlayerPed()->m_nPedState; pedState = FindPlayerPed()->m_nPedState;
if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
return NO_SAMPLE; return NO_SAMPLE;
GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6); GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6);
break;
default:
return GetGenericMaleTalkSfx(sound);
} }
return (SFX_SWAT_VOICE_2_CHASE_1 - SFX_SWAT_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 4) + sfx; return (SFX_SWAT_VOICE_2_CHASE_1 - SFX_SWAT_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 4) + sfx;
@ -4021,17 +4023,18 @@ cAudioManager::GetFBITalkSfx(int16 sound)
PedState pedState; PedState pedState;
static uint32 lastSfx = NO_SAMPLE; static uint32 lastSfx = NO_SAMPLE;
if (sound == SOUND_PED_ARREST_FBI) { switch (sound) {
case SOUND_PED_ARREST_FBI:
GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6); GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6);
} else { break;
if (sound != SOUND_PED_PURSUIT_FBI) { case SOUND_PED_PURSUIT_FBI:
return GetGenericMaleTalkSfx(sound);
}
pedState = FindPlayerPed()->m_nPedState; pedState = FindPlayerPed()->m_nPedState;
if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
return NO_SAMPLE; return NO_SAMPLE;
GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6); GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6);
break;
default:
return GetGenericMaleTalkSfx(sound);
} }
return (SFX_FBI_VOICE_2_CHASE_1 - SFX_FBI_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx; return (SFX_FBI_VOICE_2_CHASE_1 - SFX_FBI_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@ -4044,14 +4047,15 @@ cAudioManager::GetArmyTalkSfx(int16 sound)
PedState pedState; PedState pedState;
static uint32 lastSfx = NO_SAMPLE; static uint32 lastSfx = NO_SAMPLE;
if (sound != SOUND_PED_PURSUIT_ARMY) { switch (sound) {
return GetGenericMaleTalkSfx(sound); case SOUND_PED_PURSUIT_ARMY:
}
pedState = FindPlayerPed()->m_nPedState; pedState = FindPlayerPed()->m_nPedState;
if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
return NO_SAMPLE; return NO_SAMPLE;
GetPhrase(&sfx, &lastSfx, SFX_ARMY_VOICE_1_CHASE_1, 15); GetPhrase(&sfx, &lastSfx, SFX_ARMY_VOICE_1_CHASE_1, 15);
default:
return GetGenericMaleTalkSfx(sound);
}
return (SFX_ARMY_VOICE_2_CHASE_1 - SFX_ARMY_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx; return (SFX_ARMY_VOICE_2_CHASE_1 - SFX_ARMY_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
} }
@ -4133,13 +4137,17 @@ cAudioManager::GetTaxiDriverTalkSfx(int16 sound)
uint32 sfx; uint32 sfx;
static uint32 lastSfx = NO_SAMPLE; static uint32 lastSfx = NO_SAMPLE;
if (sound == SOUND_PED_CAR_JACKED) { switch (sound) {
case SOUND_PED_CAR_JACKED:
GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_1, 7); GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_1, 7);
} else { break;
if (sound != SOUND_PED_CAR_COLLISION) case SOUND_PED_CAR_COLLISION:
return GetGenericMaleTalkSfx(sound);
GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1, 6); GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1, 6);
break;
default:
return GetGenericMaleTalkSfx(sound);
} }
return (SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_1 - SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx; return (SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_1 - SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
} }
@ -6052,10 +6060,14 @@ cAudioManager::GetBomberTalkSfx(int16 sound)
uint32 sfx; uint32 sfx;
static uint32 lastSfx = NO_SAMPLE; static uint32 lastSfx = NO_SAMPLE;
if (sound != SOUND_PED_BOMBER) switch (sound)
return GetGenericMaleTalkSfx(sound); {
case SOUND_PED_BOMBER:
GetPhrase(&sfx, &lastSfx, SFX_BOMBERMAN_1, 7); GetPhrase(&sfx, &lastSfx, SFX_BOMBERMAN_1, 7);
break;
default:
return GetGenericMaleTalkSfx(sound);
}
return sfx; return sfx;
} }
@ -6098,13 +6110,17 @@ cAudioManager::GetChunkyTalkSfx(int16 sound)
uint32 sfx; uint32 sfx;
static uint32 lastSfx = NO_SAMPLE; static uint32 lastSfx = NO_SAMPLE;
if (sound == SOUND_PED_DEATH) switch (sound)
{
case SOUND_PED_DEATH:
return SFX_CHUNKY_DEATH; return SFX_CHUNKY_DEATH;
case SOUND_PED_FLEE_RUN:
if (sound != SOUND_PED_FLEE_RUN)
return GetGenericMaleTalkSfx(sound);
GetPhrase(&sfx, &lastSfx, SFX_CHUNKY_RUN_1, 5); GetPhrase(&sfx, &lastSfx, SFX_CHUNKY_RUN_1, 5);
break;
default:
return GetGenericMaleTalkSfx(sound);
}
return sfx; return sfx;
} }
@ -6160,8 +6176,6 @@ cAudioManager::GetGenericFemaleTalkSfx(int16 sound)
return sfx; return sfx;
} }
void void
cPedComments::Add(tPedComment *com) cPedComments::Add(tPedComment *com)
{ {
@ -6175,11 +6189,7 @@ cPedComments::Add(tPedComment *com)
index = m_nCommentsInBank[m_nActiveBank]++; index = m_nCommentsInBank[m_nActiveBank]++;
} }
m_asPedComments[m_nActiveBank][index].m_nSampleIndex = com->m_nSampleIndex; m_asPedComments[m_nActiveBank][index] = *com;
m_asPedComments[m_nActiveBank][index].m_nEntityIndex = com->m_nEntityIndex;
m_asPedComments[m_nActiveBank][index].m_vecPos = com->m_vecPos;
m_asPedComments[m_nActiveBank][index].m_fDistance = com->m_fDistance;
m_asPedComments[m_nActiveBank][index].m_bVolume = com->m_bVolume;
uint32 i = 0; uint32 i = 0;
if (index != 0) { if (index != 0) {
@ -6466,7 +6476,7 @@ void
cAudioManager::ProcessScriptObject(int32 id) cAudioManager::ProcessScriptObject(int32 id)
{ {
cAudioScriptObject *entity = (cAudioScriptObject *)m_asAudioEntities[id].m_pEntity; cAudioScriptObject *entity = (cAudioScriptObject *)m_asAudioEntities[id].m_pEntity;
if (entity) { if (entity != 0) {
m_sQueueSample.m_vecPos = entity->Posn; m_sQueueSample.m_vecPos = entity->Posn;
if (m_asAudioEntities[id].m_AudioEvents == 1) if (m_asAudioEntities[id].m_AudioEvents == 1)
ProcessOneShotScriptObject(m_asAudioEntities[id].m_awAudioEvent[0]); ProcessOneShotScriptObject(m_asAudioEntities[id].m_awAudioEvent[0]);