Merge branch 'master' into miami

# Conflicts: # src/audio/AudioLogic.cpp
2021-08-16 14:31:40 +03:00
parent cd0a765f66 076b324539
commit 176cadff05
2 changed files with 20 additions and 7 deletions
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -70,8 +70,11 @@ public:
 	int32 m_nEntityIndex;
 	CVector m_vecPos;
 	float m_fDistance;
-	uint8 m_bVolume;
+	uint8 m_nVolume;
 	int8 m_nProcess;
+#if defined(EXTERNAL_3D_SOUND) && defined(FIX_BUGS)
+	uint8 m_nEmittingVolume;
+#endif
 };

 VALIDATE_SIZE(tPedComment, 28);