summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-11-08 15:49:10 +0100
committerRoman Masanin <36927roma@gmail.com>2020-11-08 15:49:10 +0100
commita553ac87161e8caff7f890ebb79b38e9cac7b5c8 (patch)
tree3f28f9da9df53ba6d40a5a121bd7f749c9a8298c
parentfix merge (diff)
downloadre3-a553ac87161e8caff7f890ebb79b38e9cac7b5c8.tar
re3-a553ac87161e8caff7f890ebb79b38e9cac7b5c8.tar.gz
re3-a553ac87161e8caff7f890ebb79b38e9cac7b5c8.tar.bz2
re3-a553ac87161e8caff7f890ebb79b38e9cac7b5c8.tar.lz
re3-a553ac87161e8caff7f890ebb79b38e9cac7b5c8.tar.xz
re3-a553ac87161e8caff7f890ebb79b38e9cac7b5c8.tar.zst
re3-a553ac87161e8caff7f890ebb79b38e9cac7b5c8.zip
-rw-r--r--src/audio/AudioLogic.cpp4
-rw-r--r--src/audio/AudioManager.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 140981b9..53302f16 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -3057,10 +3057,10 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
pedParams.m_fDistance = params->m_fDistance;
SetupPedComments(&pedParams, SOUND_PED_BODYCAST_HIT);
continue; */
- case SOUND_115: {
+ case SOUND_PED_VCPA_PLAYER_FOUND: {
pedParams.m_bDistanceCalculated = params->m_bDistanceCalculated;
pedParams.m_fDistance = params->m_fDistance;
- SetupPedComments(&pedParams, SOUND_115);
+ SetupPedComments(&pedParams, SOUND_PED_VCPA_PLAYER_FOUND);
}
case SOUND_WATER_FALL: {
const float SOUND_INTENSITY = 40.0f;
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 992b21a0..cdb59412 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -374,8 +374,8 @@ public:
uint8 GetNum3DProvidersAvailable() const; // done
uint32 GetPedCommentSfx(CPed *ped, int32 sound);
void GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) const;
- float GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange); //done
- float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);//done
+ float GetVehicleDriveWheelSkidValue(CVehicle* veh, tWheelState wheelState, float gasPedalAudio, cTransmission* transmission, float velocityChange); // done
+ float GetVehicleNonDriveWheelSkidValue(CVehicle* veh, tWheelState wheelState, cTransmission* transmission, float velocityChange); // done
bool HasAirBrakes(int32 model) const; // done