mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-13 14:34:07 +00:00
Code Issues Projects Releases Wiki Activity

merge with master

Browse source
This commit is contained in:
Nikolay Korolev 2020-03-28 20:55:15 +03:00
commit 101c21e064
57 changed files with 682 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/audio/AudioManager.cpp
View file

@ -20,6 +20,7 @@
#include "MusicManager.h"
#include "Pad.h"
#include "Ped.h"
#include "Fire.h"
#include "Physical.h"
#include "Placeable.h"
#include "Plane.h"
@ -7533,8 +7534,8 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
void cAudioManager::ProcessWaterCannon(int32)
{
for(int32 i = 0; i < NUM_WATERCANNONS; i++) {
if(aCannons[i].m_nId) {
m_sQueueSample.m_vecPos = aCannons[0].m_avecPos[aCannons[i].m_wIndex];
if(CWaterCannons::aCannons[i].m_nId) {
m_sQueueSample.m_vecPos = CWaterCannons::aCannons[0].m_avecPos[CWaterCannons::aCannons[i].m_nCur];
float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
if(distSquared < 900.f) {
m_sQueueSample.m_fDistance = Sqrt(distSquared);