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

cleanup processVehicle

Browse source
This commit is contained in:
Roman Masanin 2020-09-18 19:14:36 +03:00
parent 7f77e8a441
commit 5f810ff21c
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/audio/AudioLogic.cpp
View file

@ -707,7 +707,6 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
CAutomobile* automobile; CAutomobile* automobile;
float gasPedal; float gasPedal;
//44-58
player = FindPlayerPed(); player = FindPlayerPed();
playerVeh = FindPlayerVehicle(); playerVeh = FindPlayerVehicle();
if (playerVeh == NULL && player != NULL) { if (playerVeh == NULL && player != NULL) {
@ -722,7 +721,6 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
|| CGame::currArea == AREA_EVERYWHERE || CGame::currArea == AREA_EVERYWHERE
|| CGame::currArea == AREA_MALL || CGame::currArea == AREA_MALL
|| CGame::currArea == AREA_MAIN_MAP) { || CGame::currArea == AREA_MAIN_MAP) {
//62-84
m_sQueueSample.m_vecPos = veh->GetPosition(); m_sQueueSample.m_vecPos = veh->GetPosition();
params.m_bDistanceCalculated = false; params.m_bDistanceCalculated = false;
params.m_pVehicle = veh; params.m_pVehicle = veh;
@ -741,9 +739,8 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
ProcessEngineDamage(&params); ProcessEngineDamage(&params);
return; return;
} }
//104-
switch (params.m_VehicleType) { switch (params.m_VehicleType) {
case VEHICLE_TYPE_CAR://done case VEHICLE_TYPE_CAR:
automobile = (CAutomobile*)veh; automobile = (CAutomobile*)veh;
UpdateGasPedalAudio(&automobile->m_fGasPedalAudio, automobile->m_fGasPedal); UpdateGasPedalAudio(&automobile->m_fGasPedalAudio, automobile->m_fGasPedal);
if (veh->m_modelIndex == MI_RCBANDIT || veh->m_modelIndex == MI_RCBARON) { if (veh->m_modelIndex == MI_RCBANDIT || veh->m_modelIndex == MI_RCBARON) {
@ -786,7 +783,7 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
ProcessVehicleOneShots(&params); ProcessVehicleOneShots(&params);
automobile->m_fVelocityChangeForAudio = params.m_fVelocityChange; automobile->m_fVelocityChangeForAudio = params.m_fVelocityChange;
break; break;
case VEHICLE_TYPE_BOAT://done case VEHICLE_TYPE_BOAT:
if (veh->m_modelIndex == MI_SKIMMER) if (veh->m_modelIndex == MI_SKIMMER)
ProcessHelicopter(&params); ProcessHelicopter(&params);
else else
@ -794,11 +791,11 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
ProcessBoatMovingOverWater(&params); ProcessBoatMovingOverWater(&params);
ProcessVehicleOneShots(&params); ProcessVehicleOneShots(&params);
break; break;
case VEHICLE_TYPE_HELI: //done case VEHICLE_TYPE_HELI:
ProcessHelicopter(&params); //TODO recheck ProcessHelicopter(&params); //recheck
ProcessVehicleOneShots(&params); ProcessVehicleOneShots(&params);
break; break;
case VEHICLE_TYPE_PLANE://done case VEHICLE_TYPE_PLANE:
switch (params.m_nIndex) { switch (params.m_nIndex) {
case AIRTRAIN: case AIRTRAIN:
ProcessJumbo(&params);//recheck ProcessJumbo(&params);//recheck
@ -812,13 +809,8 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
ProcessVehicleOneShots(&params); ProcessVehicleOneShots(&params);
//ProcessVehicleFlatType(&params); //ProcessVehicleFlatType(&params);
break; break;
case VEHICLE_TYPE_BIKE: //done case VEHICLE_TYPE_BIKE:
bike = (CBike*)veh; bike = (CBike*)veh;
//gasPedal = fabs(veh->m_fGasPedal);
//if (gasPedal <= bike->m_fGasPedalAudio)
// bike->m_fGasPedalAudio = Max(bike->m_fGasPedalAudio - 0.07f, gasPedal);
//else
// bike->m_fGasPedalAudio = Min(bike->m_fGasPedalAudio + 0.09f, gasPedal);
UpdateGasPedalAudio(&bike->m_fGasPedalAudio, bike->m_fGasPedal); UpdateGasPedalAudio(&bike->m_fGasPedalAudio, bike->m_fGasPedal);
if (ProcessVehicleRoadNoise(&params)) { if (ProcessVehicleRoadNoise(&params)) {
if (CWeather::WetRoads > 0.0f) if (CWeather::WetRoads > 0.0f)

2
src/audio/AudioManager.h
View file

@ -143,7 +143,7 @@ public:
class cVehicleParams class cVehicleParams
{ {
public: public:
int32 m_VehicleType; eVehicleType m_VehicleType;
bool m_bDistanceCalculated; bool m_bDistanceCalculated;
float m_fDistance; float m_fDistance;
CVehicle *m_pVehicle; CVehicle *m_pVehicle;