summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioCollision.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-07-27 21:02:45 +0200
committerSergeanur <s.anureev@yandex.ua>2021-07-27 21:02:45 +0200
commitad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb (patch)
treec69d24c2f3e98a1543e64b74de7450e4052d04f4 /src/audio/AudioCollision.h
parentMerge pull request #1255 from Nick007J/lcs (diff)
parentSort AudioCollision functions into original order (diff)
downloadre3-ad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb.tar
re3-ad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb.tar.gz
re3-ad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb.tar.bz2
re3-ad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb.tar.lz
re3-ad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb.tar.xz
re3-ad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb.tar.zst
re3-ad2ccdb44a9a8d5a29d3184b2ff03a258a96bdfb.zip
Diffstat (limited to 'src/audio/AudioCollision.h')
-rw-r--r--src/audio/AudioCollision.h23
1 files changed, 21 insertions, 2 deletions
diff --git a/src/audio/AudioCollision.h b/src/audio/AudioCollision.h
index a00b16d9..31be0334 100644
--- a/src/audio/AudioCollision.h
+++ b/src/audio/AudioCollision.h
@@ -17,7 +17,18 @@ public:
float m_fDistance;
int32 m_nBaseVolume;
- // no methods
+ cAudioCollision() { Reset(); }
+
+ void Reset()
+ {
+ m_pEntity1 = nil;
+ m_pEntity2 = nil;
+ m_bSurface1 = 0;
+ m_bSurface2 = 0;
+ m_fIntensity1 = m_fIntensity2 = 0.0f;
+ m_vecPosition = CVector(0.0f, 0.0f, 0.0f);
+ m_fDistance = 0.0f;
+ }
};
VALIDATE_SIZE(cAudioCollision, 40);
@@ -31,7 +42,15 @@ public:
uint8 m_bCollisionsInQueue;
cAudioCollision m_sQueue;
- cAudioCollisionManager();
+ cAudioCollisionManager()
+ {
+ m_sQueue.Reset();
+
+ for(int i = 0; i < NUMAUDIOCOLLISIONS; i++)
+ m_bIndicesTable[i] = NUMAUDIOCOLLISIONS;
+
+ m_bCollisionsInQueue = 0;
+ }
void AddCollisionToRequestedQueue();
};