summaryrefslogtreecommitdiffstats
path: root/src/audio/MusicManager.h
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2021-02-03 12:22:33 +0100
committerGitHub <noreply@github.com>2021-02-03 12:22:33 +0100
commitf42f785c7887760f94bf655eec839b29ebf7868b (patch)
tree821b2b5497c99d8dea83ce5ead645002503e5b95 /src/audio/MusicManager.h
parentFix compilation (diff)
parentMusicManager fixes (diff)
downloadre3-f42f785c7887760f94bf655eec839b29ebf7868b.tar
re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.gz
re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.bz2
re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.lz
re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.xz
re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.zst
re3-f42f785c7887760f94bf655eec839b29ebf7868b.zip
Diffstat (limited to 'src/audio/MusicManager.h')
-rw-r--r--src/audio/MusicManager.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index e8b94da6..5d277f0e 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -18,8 +18,8 @@ public:
bool m_bIsInitialised;
bool m_bDisabled;
uint8 m_nMusicMode;
- uint8 m_nCurrentStreamedSound;
- uint8 m_nPreviousStreamedSound;
+ uint8 m_nNextTrack;
+ uint8 m_nPlayingTrack;
bool m_bFrontendTrackFinished;
bool m_bPlayInFrontend;
bool m_bSetNextStation;
@@ -34,9 +34,9 @@ public:
uint32 m_nTimer;
bool m_bDoTrackService;
bool m_bIgnoreTimeDelay;
- bool m_bDontServiceAmbienceTrack;
+ bool m_bVerifyAmbienceTrackStartedToPlay;
bool m_bRadioSetByScript;
- uint8 m_nRadioStation;
+ uint8 m_nRadioStationScript;
int32 m_nRadioPosition;
uint8 m_nRadioInCar;
@@ -44,7 +44,7 @@ public:
cMusicManager();
bool IsInitialised() { return m_bIsInitialised; }
uint32 GetMusicMode() { return m_nMusicMode; }
- uint8 GetCurrentTrack() { return m_nCurrentStreamedSound; }
+ uint8 GetNextTrack() { return m_nNextTrack; }
bool Initialise();
void Terminate();