Reintroduce D1 title song bug

In past releases, D1X-Rebirth played the title song even when the user
specified `-notitles`.  Commit 29f79f0a6b
("Enable -notitles for Descent 2") fixed this.  Unfortunately, despite
being called SONG_TITLE, users believe this to be main menu music, not
title screen music.  This belief is reinforced by other code sites that
play the title song on returning to the main menu.  Reintroduce the bug
by moving the call above the test for `-notitles`.  This restores the
semantics that users expect.
This commit is contained in:
Kp 2016-08-28 22:41:49 +00:00
parent c484c55153
commit 1402a21946

View file

@ -208,10 +208,12 @@ static void show_first_found_title_screen(const char *oem, const char *share, co
namespace dsx {
void show_titles(void)
{
#if defined(DXX_BUILD_DESCENT_I)
songs_play_song(SONG_TITLE, 1);
#endif
if (CGameArg.SysNoTitles)
return;
#if defined(DXX_BUILD_DESCENT_I)
songs_play_song( SONG_TITLE, 1 );
show_first_found_title_screen(
"macplay.pcx", // Mac Shareware