summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-20 20:22:40 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-20 20:22:40 +0200
commit5b953228b416ac894026fe9509a39a4e3b8850b3 (patch)
treed1eff63c9e59f367ff3197c9dc57d0ad1f30262e
parentMerge pull request #572 from erorcun/miami (diff)
downloadre3-5b953228b416ac894026fe9509a39a4e3b8850b3.tar
re3-5b953228b416ac894026fe9509a39a4e3b8850b3.tar.gz
re3-5b953228b416ac894026fe9509a39a4e3b8850b3.tar.bz2
re3-5b953228b416ac894026fe9509a39a4e3b8850b3.tar.lz
re3-5b953228b416ac894026fe9509a39a4e3b8850b3.tar.xz
re3-5b953228b416ac894026fe9509a39a4e3b8850b3.tar.zst
re3-5b953228b416ac894026fe9509a39a4e3b8850b3.zip
-rw-r--r--src/audio/AudioLogic.cpp4
-rw-r--r--src/audio/sampman_miles.cpp4
-rw-r--r--src/audio/sampman_oal.cpp4
-rw-r--r--src/control/Pickups.cpp1
4 files changed, 11 insertions, 2 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 9080a2dd..cc157389 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -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
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index a2a206a4..ad2c512f 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -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;
}
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 30efd7f5..f16afbba 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -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;
}
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 9492e0e1..4e4c02ab 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -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;