summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-30 13:37:52 +0200
committerGitHub <noreply@github.com>2019-06-30 13:37:52 +0200
commit9b5a7cd4bb6d106e10e4502f123814f4ece44a2f (patch)
tree3ca33433362742fad0a4342b1047f992c70602c9 /src/audio
parentMerge pull request #77 from Nick007J/master (diff)
parentCleanup project a bit (diff)
downloadre3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.gz
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.bz2
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.lz
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.xz
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.zst
re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/MusicManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 6f2d3d86..7b7c1182 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -55,7 +55,7 @@ void cMusicManager::DisplayRadioStationName()
if (!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && cMusicManager::PlayerInCar() && !CReplay::IsPlayingBack()) {
if (MusicManager.m_bPlayerInCar && !MusicManager.m_bPreviousPlayerInCar)
- pCurrentStation = nullptr;
+ pCurrentStation = nil;
if (cSampleManager.IsMP3RadioChannelAvailable()) {
gStreamedSound = MusicManager.m_nCurrentStreamedSound;
@@ -103,7 +103,7 @@ void cMusicManager::DisplayRadioStationName()
}
}
- wchar *string = nullptr;
+ wchar *string = nil;
switch (pRetune) {
case HEAD_RADIO: