a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 12:59:59 +00:00
Code Issues Projects Releases Wiki Activity

Pickups fix

Browse source
This commit is contained in:
Sergeanur 2020-11-08 15:00:54 +02:00
parent 7ede8685ec
commit a2e0373d22
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/audio/AudioLogic.cpp
View file

@ -7201,7 +7201,10 @@ cPedComments::Process()
AudioManager.m_sQueueSample.m_bRequireReflection = true; AudioManager.m_sQueueSample.m_bRequireReflection = true;
AudioManager.m_sQueueSample.m_bIs2D = false; AudioManager.m_sQueueSample.m_bIs2D = false;
#ifdef FIX_BUGS #ifdef FIX_BUGS
AudioManager.m_sQueueSample.m_bIs2D = sampleIndex >= 8694 && sampleIndex < TOTAL_AUDIO_SAMPLES; // check if player sfx, TODO: enum if (sampleIndex >= 8694 && sampleIndex < TOTAL_AUDIO_SAMPLES) { // check if player sfx, TODO: enum
AudioManager.m_sQueueSample.m_bIs2D = true;
AudioManager.m_sQueueSample.m_nOffset = 63;
}
#endif // FIX_BUGS #endif // FIX_BUGS
AudioManager.m_sQueueSample.m_nFrequency = AudioManager.m_sQueueSample.m_nFrequency =
SampleManager.GetSampleBaseFrequency(AudioManager.m_sQueueSample.m_nSampleIndex) + AudioManager.RandomDisplacement(750); SampleManager.GetSampleBaseFrequency(AudioManager.m_sQueueSample.m_nSampleIndex) + AudioManager.RandomDisplacement(750);

7
src/control/Pickups.cpp
View file

@ -508,7 +508,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
result = true; result = true;
Remove(); Remove();
DMAudio.PlayFrontEndSound(SOUND_PICKUP_HIDDEN_PACKAGE, 0); DMAudio.PlayFrontEndSound(SOUND_PICKUP_HIDDEN_PACKAGE, 0);
return true; break;
case PICKUP_MONEY: case PICKUP_MONEY:
CWorld::Players[playerId].m_nMoney += m_nQuantity; CWorld::Players[playerId].m_nMoney += m_nQuantity;
sprintf(gString, "$%d", m_nQuantity); sprintf(gString, "$%d", m_nQuantity);
@ -518,12 +518,13 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
result = true; result = true;
Remove(); Remove();
DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0); DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0);
return true; player->Say(SOUND_PED_MUGGING);
break;
case PICKUP_ASSET_REVENUE: case PICKUP_ASSET_REVENUE:
CWorld::Players[CWorld::PlayerInFocus].m_nMoney += m_fRevenue; CWorld::Players[CWorld::PlayerInFocus].m_nMoney += m_fRevenue;
m_fRevenue = 0.0f; m_fRevenue = 0.0f;
DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0); DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0);
return false; break;
case PICKUP_PROPERTY_LOCKED: case PICKUP_PROPERTY_LOCKED:
if (!m_bWasControlMessageShown) { if (!m_bWasControlMessageShown) {
m_bWasControlMessageShown = true; m_bWasControlMessageShown = true;

1
src/peds/PlayerPed.cpp
View file

@ -1055,6 +1055,7 @@ CPlayerPed::FindWeaponLockOnTarget(void)
if (nextTarget) if (nextTarget)
nextTarget->RegisterReference((CEntity**)&m_pPointGunAt); nextTarget->RegisterReference((CEntity**)&m_pPointGunAt);
SetPointGunAt(nextTarget); SetPointGunAt(nextTarget);
Say(SOUND_PED_AIMING);
return true; return true;
} }