Change playMusic return type from bool to void

OpenLoco · Apr 3, 2024 · 0e59eb3 · 0e59eb3
1 parent 95e6537
commit 0e59eb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/OpenLoco/src/Audio/Audio.cpp b/src/OpenLoco/src/Audio/Audio.cpp
@@ -1131,7 +1131,7 @@ namespace OpenLoco::Audio
 
  // Load info on the song to play.
  const auto& mi = kMusicInfo[_currentSong];
- cfg.musicPlaying = playMusic(mi.pathId, cfg.volume, false);
+ playMusic(mi.pathId, cfg.volume, false);
 
  WindowManager::invalidate(WindowType::options);
  }
@@ -1141,17 +1141,17 @@ namespace OpenLoco::Audio
 
  // 0x0048AC66
  // previously called void playTitleScreenMusic()
- bool playMusic(PathId sample, int32_t volume, bool loop)
+ void playMusic(PathId sample, int32_t volume, bool loop)
  {
  auto* channel = getChannel(ChannelId::music);
  if (!_audioInitialised || _audioIsPaused || !_audioIsEnabled || channel == nullptr)
  {
- return false;
+ return;
  }
 
  if (currentTrackPathId == sample)
  {
- return true;
+ return;
  }
 
  currentTrackPathId = sample;
@@ -1161,10 +1161,8 @@ namespace OpenLoco::Audio
  if (channel->load(*musicSample))
  {
  channel->setVolume(volume);
- return channel->play(loop);
+ channel->play(loop);
  }
-
- return false;
  }
 
  // 0x0048AAD2

diff --git a/src/OpenLoco/src/Audio/Audio.h b/src/OpenLoco/src/Audio/Audio.h
@@ -132,7 +132,7 @@ namespace OpenLoco::Audio
  void resetMusic();
  void playBackgroundMusic();
  void stopMusic();
- bool playMusic(Environment::PathId sample, int32_t volume, bool loop);
+ void playMusic(Environment::PathId sample, int32_t volume, bool loop);
 
  void resetSoundObjects();