crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity

FORMAT

Browse Source
This commit is contained in:
Roman Masanin 2020-11-04 11:37:17 +03:00
parent 174424c520
commit 89b622eea8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/audio/AudioLogic.cpp
View File

@ -300,7 +300,7 @@ CVehicle *cAudioManager::FindVehicleOfPlayer()
void void
cAudioManager::ProcessPlayerMood() cAudioManager::ProcessPlayerMood()
{ {
CPlayerPed* playerPed; CPlayerPed *playerPed;
uint32* lastMisstonPassedTime; uint32* lastMisstonPassedTime;
uint32 curTime = CTimer::GetTimeInMilliseconds(); uint32 curTime = CTimer::GetTimeInMilliseconds();
@ -336,7 +336,7 @@ cAudioManager::ProcessPlayerMood()
void void
cAudioManager::ProcessSpecial() cAudioManager::ProcessSpecial()
{ {
CPlayerPed* playerPed; CPlayerPed *playerPed;
if (m_nUserPause) { if (m_nUserPause) {
if (!m_nPreviousUserPause) { if (!m_nPreviousUserPause) {
@ -867,7 +867,7 @@ cAudioManager::ProcessRainOnVehicle(cVehicleParams *params)
{ {
const int SOUND_INTENSITY = 22.0f; const int SOUND_INTENSITY = 22.0f;
CVehicle* veh; CVehicle *veh;
uint8 emittingVol; uint8 emittingVol;
if (params->m_fDistance >= SQR(SOUND_INTENSITY) || CWeather::Rain <= 0.01f || CCullZones::CamNoRain() && CCullZones::PlayerNoRain()) if (params->m_fDistance >= SQR(SOUND_INTENSITY) || CWeather::Rain <= 0.01f || CCullZones::CamNoRain() && CCullZones::PlayerNoRain())
@ -1147,7 +1147,7 @@ cAudioManager::ProcessModelHeliVehicle(cVehicleParams* params)
} }
bool bool
cAudioManager::ProcessVehicleRoadNoise(cVehicleParams* params) cAudioManager::ProcessVehicleRoadNoise(cVehicleParams *params)
{ {
const float SOUND_INTENSITY = 95.0f; const float SOUND_INTENSITY = 95.0f;
@ -1215,7 +1215,7 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams* params)
} }
bool bool
cAudioManager::ProcessWetRoadNoise(cVehicleParams* params) cAudioManager::ProcessWetRoadNoise(cVehicleParams *params)
{ {
const float SOUND_INTENSITY = 30.0f; const float SOUND_INTENSITY = 30.0f;
@ -2166,7 +2166,7 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
} }
float float
cAudioManager::GetVehicleDriveWheelSkidValue(CVehicle* veh, tWheelState wheelState, float gasPedalAudio, cTransmission *transmission, float velocityChange) cAudioManager::GetVehicleDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, float gasPedalAudio, cTransmission *transmission, float velocityChange)
{ {
float relativeVelChange = 0.0f; float relativeVelChange = 0.0f;
float velChange; float velChange;
@ -2201,7 +2201,7 @@ cAudioManager::GetVehicleDriveWheelSkidValue(CVehicle* veh, tWheelState wheelSta
} }
float float
cAudioManager::GetVehicleNonDriveWheelSkidValue(CVehicle* veh, tWheelState wheelState, cTransmission *transmission, float velocityChange) cAudioManager::GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, cTransmission *transmission, float velocityChange)
{ {
float relativeVelChange = 0.0f; float relativeVelChange = 0.0f;
@ -2212,7 +2212,7 @@ cAudioManager::GetVehicleNonDriveWheelSkidValue(CVehicle* veh, tWheelState wheel
} }
bool bool
cAudioManager::ProcessVehicleHorn(cVehicleParams* params) cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
{ {
const float SOUND_INTENSITY = 40.0f; const float SOUND_INTENSITY = 40.0f;
@ -2288,11 +2288,11 @@ cAudioManager::UsesSirenSwitching(cVehicleParams *params) const
} }
bool bool
cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams* params) cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams *params)
{ {
const float SOUND_INTENSITY = 110.0f; const float SOUND_INTENSITY = 110.0f;
CVehicle* veh; CVehicle *veh;
uint8 volume; uint8 volume;
if (params->m_fDistance >= SQR(SOUND_INTENSITY)) if (params->m_fDistance >= SQR(SOUND_INTENSITY))
@ -2948,8 +2948,8 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
} }
case SOUND_WEAPON_SHOT_FIRED: { case SOUND_WEAPON_SHOT_FIRED: {
const float SOUND_INTENSITY = 120.0f; const float SOUND_INTENSITY = 120.0f;
CVehicle* playerVeh; CVehicle *playerVeh;
CPlayerPed* playerPed; CPlayerPed *playerPed;
switch (params->m_pVehicle->m_modelIndex) { switch (params->m_pVehicle->m_modelIndex) {
case MI_HUNTER: case MI_HUNTER:
@ -2962,7 +2962,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
if (Pads[0].GetHandBrake() == 0) { if (Pads[0].GetHandBrake() == 0) {
playerVeh = FindPlayerVehicle(); playerVeh = FindPlayerVehicle();
playerPed = FindPlayerPed(); playerPed = FindPlayerPed();
if (playerVeh == 0 && playerPed != 0) { if (playerVeh == nil && playerPed != nil) {
if (playerPed->m_attachedTo != nil && playerPed->m_attachedTo->GetType() == ENTITY_TYPE_VEHICLE) if (playerPed->m_attachedTo != nil && playerPed->m_attachedTo->GetType() == ENTITY_TYPE_VEHICLE)
playerVeh = (CVehicle*)playerPed->m_attachedTo; playerVeh = (CVehicle*)playerPed->m_attachedTo;
} }
@ -3842,9 +3842,9 @@ DoJumboVolOffset()
} }
void void
cAudioManager::ProcessJumbo(cVehicleParams* params) cAudioManager::ProcessJumbo(cVehicleParams *params)
{ {
CPlane* plane; CPlane *plane;
float position; float position;
if (params->m_fDistance >= SQR(440)) if (params->m_fDistance >= SQR(440))