mirror of
https://github.com/GTAmodding/re3.git
synced 2024-11-16 10:19:00 +00:00
Pickup and audio fix
This commit is contained in:
parent
71b9b2ecf9
commit
5b953228b4
4 changed files with 11 additions and 2 deletions
|
@ -3849,9 +3849,9 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
|
|||
//if (ped->IsPlayer())
|
||||
// return GetPlayerTalkSfx(sound);
|
||||
|
||||
// TODO: miami peds
|
||||
// TODO(Miami): ped comments
|
||||
|
||||
return TOTAL_AUDIO_SAMPLES;
|
||||
return NO_SAMPLE;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1469,6 +1469,10 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
|
|||
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
||||
{
|
||||
slot = nCurrentPedSlot - i - 1;
|
||||
#ifdef FIX_BUGS
|
||||
if (slot < 0)
|
||||
slot += ARRAY_SIZE(nPedSlotSfx);
|
||||
#endif
|
||||
if ( nComment == nPedSlotSfx[slot] )
|
||||
return slot;
|
||||
}
|
||||
|
|
|
@ -800,6 +800,10 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
|
|||
for (int32 i = 0; i < _TODOCONST(3); i++)
|
||||
{
|
||||
slot = nCurrentPedSlot - i - 1;
|
||||
#ifdef FIX_BUGS
|
||||
if (slot < 0)
|
||||
slot += ARRAY_SIZE(nPedSlotSfx);
|
||||
#endif
|
||||
if (nComment == nPedSlotSfx[slot])
|
||||
return slot;
|
||||
}
|
||||
|
|
|
@ -136,6 +136,7 @@ CPickup::GiveUsAPickUpObject(int32 handle)
|
|||
object->bExplosionProof = true;
|
||||
object->bUsesCollision = false;
|
||||
object->bIsPickup = true;
|
||||
object->bHasPreRenderEffects = true;
|
||||
|
||||
object->m_nBonusValue = m_eModelIndex == MI_PICKUP_BONUS ? m_nQuantity : 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue