Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse Source 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
This commit is contained in:
Sergeanur
2020-06-30 19:12:06 +03:00
parent cbed027c0e da93b0a078
commit 8045bec6a5
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/AudioManager.h
View File

@@ -108,7 +108,7 @@ public:
int32 m_nSampleIndex[MISSION_AUDIO_SLOTS];
uint8 m_nLoadingStatus[MISSION_AUDIO_SLOTS];
uint8 m_nPlayStatus[MISSION_AUDIO_SLOTS];
uint8 field_22[MISSION_AUDIO_SLOTS]; // todo find a name
bool m_bIsPlaying[MISSION_AUDIO_SLOTS];
int32 m_nMissionAudioCounter[MISSION_AUDIO_SLOTS];
bool m_bIsPlayed[MISSION_AUDIO_SLOTS];
bool m_bIsMobile[MISSION_AUDIO_SLOTS];