summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.h
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2019-10-19 13:21:35 +0200
committerFilip Gawin <filip.gawin@zoho.com>2019-10-26 13:05:00 +0200
commitfef3b5f978856c5ebabcdc27340de163173f3883 (patch)
tree77c8f3981174accae5a07314b7622b7880b53b7e /src/audio/AudioManager.h
parentFixes for nitpicks (diff)
downloadre3-fef3b5f978856c5ebabcdc27340de163173f3883.tar
re3-fef3b5f978856c5ebabcdc27340de163173f3883.tar.gz
re3-fef3b5f978856c5ebabcdc27340de163173f3883.tar.bz2
re3-fef3b5f978856c5ebabcdc27340de163173f3883.tar.lz
re3-fef3b5f978856c5ebabcdc27340de163173f3883.tar.xz
re3-fef3b5f978856c5ebabcdc27340de163173f3883.tar.zst
re3-fef3b5f978856c5ebabcdc27340de163173f3883.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioManager.h24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 84062e0a..d9224ced 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -4,7 +4,9 @@
#include "DMAudio.h"
#include "common.h"
-struct tActiveSample {
+class tActiveSample
+{
+public:
int32 m_nEntityIndex;
int32 m_counter;
int32 m_nSampleIndex;
@@ -53,7 +55,8 @@ struct tActiveSample {
static_assert(sizeof(tActiveSample) == 92, "tActiveSample: error");
-enum eAudioType : int32 {
+enum eAudioType : int32
+{
AUDIOTYPE_PHYSICAL = 0,
AUDIOTYPE_EXPLOSION = 1,
AUDIOTYPE_FIRE = 2,
@@ -74,7 +77,9 @@ enum eAudioType : int32 {
class CPhysical;
class CAutomobile;
-struct tAudioEntity {
+class tAudioEntity
+{
+public:
eAudioType m_nType;
void *m_pEntity;
bool m_bIsUsed;
@@ -90,7 +95,9 @@ struct tAudioEntity {
static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
-struct tPedComment {
+class tPedComment
+{
+public:
int32 m_nSampleIndex;
int32 m_entityIndex;
CVector m_vecPos;
@@ -254,13 +261,10 @@ public:
uint8 field_13;
uint8 field_14;
uint8 field_15;
- // 100
int32 m_nTimer;
tActiveSample m_sQueueSample;
- // 224
bool m_bActiveSampleQueue;
uint8 gap_109[3];
- // 264
tActiveSample m_asSamples[2][27];
uint8 m_abSampleQueueIndexTable[2][27];
uint8 m_bSampleRequestQueuesStatus[2];
@@ -563,8 +567,10 @@ public:
bool UsesSiren(int32 model) const;
bool UsesSirenSwitching(int32 model) const;
- void sub_57C2B0(); // todo (weird) and obtain name
- int32 sub_57C320(uint8 a1, float a2, float a3); /// ok (get name)
+ // only used in pc
+ void AdjustSamplesVolume(); /// ok
+ int32 ComputeEmittingVolume(uint8 emittingVolume, float intensity,
+ float dist); /// ok
};
static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");