summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-06-08 13:29:55 +0200
committerSergeanur <s.anureev@yandex.ua>2020-06-08 13:29:55 +0200
commit8cd87236c98bc42cd98f80fc488460881cae2880 (patch)
treef8b7b5f9294f624b2947bb6e31546fa0fc9f699f /src/audio/AudioManager.h
parentMerge branch 'miami' into VC/MissionAudio (diff)
downloadre3-8cd87236c98bc42cd98f80fc488460881cae2880.tar
re3-8cd87236c98bc42cd98f80fc488460881cae2880.tar.gz
re3-8cd87236c98bc42cd98f80fc488460881cae2880.tar.bz2
re3-8cd87236c98bc42cd98f80fc488460881cae2880.tar.lz
re3-8cd87236c98bc42cd98f80fc488460881cae2880.tar.xz
re3-8cd87236c98bc42cd98f80fc488460881cae2880.tar.zst
re3-8cd87236c98bc42cd98f80fc488460881cae2880.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioManager.h18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index e30c1068..e89efbd2 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -28,6 +28,7 @@ public:
uint8 m_nLoopsRemaining;
bool m_bRequireReflection; // Used for oneshots
uint8 m_nOffset;
+ uint8 field_4C;
int32 m_nReleasingVolumeDivider;
bool m_bIsProcessed;
bool m_bLoopEnded;
@@ -35,7 +36,7 @@ public:
int8 m_nVolumeChange;
};
-VALIDATE_SIZE(tSound, 92);
+VALIDATE_SIZE(tSound, 96);
class CPhysical;
class CAutomobile;
@@ -193,6 +194,14 @@ public:
CVector m_avecReflectionsPos[NUM_AUDIO_REFLECTIONS];
float m_afReflectionsDistances[NUM_AUDIO_REFLECTIONS];
cAudioScriptObjectManager m_sAudioScriptObjectManager;
+
+ // miami
+ uint8 field_4B30;
+ uint8 m_bPlayerMood;
+ uint32 field_4B34;
+ uint8 field_rest[4];
+ uint8 field_4B3C;
+
cPedComments m_sPedComments;
int32 m_nFireAudioEntity;
int32 m_nWaterCannonEntity;
@@ -202,7 +211,11 @@ public:
int32 m_nCollisionEntity;
cAudioCollisionManager m_sCollisionManager;
int32 m_nProjectileEntity;
+#ifdef GTA_BRIDGE
int32 m_nBridgeEntity;
+#endif
+ int32 m_nEscalatorEntity;
+ int32 m_nExtraSoundsEntity;
cMissionAudio m_sMissionAudio;
uint8 field_5538; // something related to phone dialogues
int32 m_anRandomTable[5];
@@ -210,6 +223,7 @@ public:
uint8 m_nUserPause;
uint8 m_nPreviousUserPause;
uint32 m_FrameCounter;
+ uint32 field_5554;
cAudioManager();
~cAudioManager();
@@ -408,7 +422,7 @@ public:
};
#ifdef AUDIO_MSS
-//static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
+static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error");
#endif
extern cAudioManager AudioManager;