Changeset - r18575:6838f6810973
[Not reviewed]
master
0 1 0
glx - 13 years ago 2011-12-04 14:17:51
glx@openttd.org
(svn r23430) -Fix (r23219): also consider the old directories when playing a song
1 file changed with 3 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/music_gui.cpp
Show inline comments
 
@@ -169,26 +169,27 @@ static void SkipToNextSong()
 

	
 
	_song_is_active = false;
 
}
 

	
 
static void MusicVolumeChanged(byte new_vol)
 
{
 
	_music_driver->SetVolume(new_vol);
 
}
 

	
 
static void DoPlaySong()
 
{
 
	char filename[MAX_PATH];
 
	FioFindFullPath(filename, lengthof(filename), BASESET_DIR,
 
			BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename);
 
	if (FioFindFullPath(filename, lengthof(filename), BASESET_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename) == NULL) {
 
		FioFindFullPath(filename, lengthof(filename), OLD_GM_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename);
 
	}
 
	_music_driver->PlaySong(filename);
 
	SetWindowDirty(WC_MUSIC_WINDOW, 0);
 
}
 

	
 
static void DoStopMusic()
 
{
 
	_music_driver->StopSong();
 
	SetWindowDirty(WC_MUSIC_WINDOW, 0);
 
}
 

	
 
static void SelectSongToPlay()
 
{
0 comments (0 inline, 0 general)