TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Do a songs_init() each time a song is played and try to read a new descent.sng - supporting descent.sng files in hog archives

Browse source
This commit is contained in:
zicodxx 2008-11-19 15:52:07 +00:00
parent 2e5cd378d3
commit 335543283e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20081119
--------
main/game.c: Actually demand ANY valid key to abort the Death sequence
main/songs.c: Do a songs_init() each time a song is played and try to read a new descent.sng - supporting descent.sng files in hog archives
20081118
--------

8
main/songs.c
View file

@ -60,8 +60,6 @@ void songs_init()
char inputline[80+1];
CFILE * fp;
if ( Songs_initialized ) return;
fp = cfopen( "descent.sng", "rb" );
if ( fp == NULL ) {
int i;
@ -140,6 +138,8 @@ void songs_init()
Songs_initialized = 1;
cfclose(fp);
if ( Songs_initialized ) return;
// RBA Hook
#if !defined(SHAREWARE) || ( defined(SHAREWARE) && defined(APPLE_DEMO) )
if (GameCfg.SndEnableRedbook)
@ -271,7 +271,7 @@ int songs_haved1_cd()
void songs_play_song( int songnum, int repeat )
{
if ( !Songs_initialized ) songs_init();
songs_init();
//stop any music already playing
@ -298,7 +298,7 @@ void songs_play_level_song( int levelnum )
Assert( levelnum != 0 );
if ( !Songs_initialized ) songs_init();
songs_init();
songs_stop_all();