From f144af949b4aaff0823b687de0641243a16c48f7 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 12 Oct 2019 09:57:58 +0300 Subject: [PATCH] - return null instead of throwing exception if CD playback isn't supported The game should switching to MIDI music on platforms without CD playback support It was impossible to start Hexen on platforms other than Windows --- libraries/zmusic/musicformats/music_cd.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/zmusic/musicformats/music_cd.cpp b/libraries/zmusic/musicformats/music_cd.cpp index e8534cc0d..4ddd44c8a 100644 --- a/libraries/zmusic/musicformats/music_cd.cpp +++ b/libraries/zmusic/musicformats/music_cd.cpp @@ -196,16 +196,14 @@ MusInfo* CDDA_OpenSong(MusicIO::FileInterface* reader) #else -#include - MusInfo* CD_OpenSong(int track, int id) { - throw std::runtime_error("CD Audio playback not supported"); + return nullptr; } MusInfo* CDDA_OpenSong(MusicIO::FileInterface* reader) { - throw std::runtime_error("CD Audio playback not supported"); + return nullptr; }