aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2008-04-10 23:31:21 +0000
committerFlorian Kagerer2008-04-10 23:31:21 +0000
commit829823c9a24ed0ca670528b03d33759119f2c7af (patch)
tree972af4e6e18e4efdc7ebc712615807ca357f334a
parenta81e9e456dc783ad75b94fa8cf9d376227f27480 (diff)
downloadscummvm-rg350-829823c9a24ed0ca670528b03d33759119f2c7af.tar.gz
scummvm-rg350-829823c9a24ed0ca670528b03d33759119f2c7af.tar.bz2
scummvm-rg350-829823c9a24ed0ca670528b03d33759119f2c7af.zip
towns music file name fix
svn-id: r31481
-rw-r--r--engines/kyra/sound_towns.cpp2
-rw-r--r--engines/kyra/staticres.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 1a79c646d1..9ac865c157 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -1414,7 +1414,7 @@ void SoundTowns_v2::playTrack(uint8 track) {
AudioCD.updateCD();
} else if (_musicEnabled) {
char musicfile[13];
- sprintf(musicfile, "%s%d.twn", fileListEntry(0), track);
+ sprintf(musicfile, fileListEntry(0), track);
if (_twnTrackData)
delete [] _twnTrackData;
_twnTrackData = _vm->resource()->fileData(musicfile, 0);
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 1618569a93..c7ee6a6b58 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1201,9 +1201,9 @@ void KyraEngine_v2::initStaticResource() {
_sequenceSoundList = tmpSndLst;
// assign music data
- static const char *fmtMusicFileListIntro[] = { "intro" };
- static const char *fmtMusicFileListFinale[] = { "finale" };
- static const char *fmtMusicFileListIngame[] = { "k2" };
+ static const char *fmtMusicFileListIntro[] = { "intro%d.twn" };
+ static const char *fmtMusicFileListFinale[] = { "finale%d.twn" };
+ static const char *fmtMusicFileListIngame[] = { "km%02d.twn" };
static const AudioDataStruct soundData_PC[] = {
{ _musicFileListIntro, _musicFileListIntroSize, 0, 0 },