Skip to content

Commit

Permalink
music: fix the main music playing at the wrong volume
Browse files Browse the repository at this point in the history
Fixed quiet or mute main menu music if a level was exited while
underwater and the quiet, full but no ambient, quiet but no
ambient, or none underwater music behavior option was set.

Resolves #1540.
  • Loading branch information
walkawayy committed Sep 25, 2024
1 parent 6b7150a commit 2fb6f0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- fixed ability to crash the game with extreme FOV values (regression from 0.9)
- fixed double "Fly mode enabled" message when using `/fly` console command (regression from 4.0)
- fixed crash in the `/set` console command (regression from 4.4)
- fixed the main menu music being quiet or mute if a level was exited while underwater and the quiet, full but no ambient, quiet but no ambient, or none underwater music behavior option was set (regression from 4.4)

## [4.4](https://github.com/LostArtefacts/TR1X/compare/4.3-102-g458cd96...4.4) - 2024-09-20
- added `/exit` command (#1462)
Expand Down
2 changes: 2 additions & 0 deletions src/game/music.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ bool Music_PlayLooped(MUSIC_TRACK_ID track)
if (g_CurrentLevel == g_GameFlow.title_level_num
&& !g_Config.enable_music_in_menu) {
return false;
} else if (g_CurrentLevel == g_GameFlow.title_level_num) {
Music_SetVolume(g_Config.music_volume);
}

M_StopActiveStream();
Expand Down

0 comments on commit 2fb6f0b

Please sign in to comment.