summaryrefslogtreecommitdiffstats
path: root/src/audio/MusicManager.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-06-30 16:55:16 +0200
committereray orçunus <erayorcunus@gmail.com>2019-06-30 16:55:16 +0200
commite650c06acd17d6440fbc31bd9dc150d6dd17c45b (patch)
tree15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/audio/MusicManager.cpp
parentMerge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff)
parentMerge pull request #79 from Nick007J/master (diff)
downloadre3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar
re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.gz
re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.bz2
re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.lz
re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.xz
re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.zst
re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.zip
Diffstat (limited to 'src/audio/MusicManager.cpp')
-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: