libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOON: Fixed offsets in hard coded conversation musics

Browse Source 
svn-id: r53144
This commit is contained in:
Sylvain Dupont 2010-10-10 23:10:14 +00:00
parent 426d6749cf
commit ce97c61079
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/toon/audio.cpp
View File

@ -70,6 +70,10 @@ void AudioManager::playMusic(Common::String dir, Common::String music) {
_currentMusicName = music;
Common::SeekableReadStream *srs = _vm->resources()->openFile(path);
if (!srs)
return;
// see what channel to take
if (_channels[0] && _channels[0]->isPlaying() && _channels[1] && _channels[1]->isPlaying()) {
// take the one that is fading
@ -91,7 +95,7 @@ void AudioManager::playMusic(Common::String dir, Common::String music) {
_currentMusicChannel = 0;
}
Common::SeekableReadStream *srs = _vm->resources()->openFile(path);
//if (!_channels[_currentMusicChannel])
// delete _channels[_currentMusicChannel];
_channels[_currentMusicChannel] = new AudioStreamInstance(this, _mixer, srs, true);

5
engines/toon/toon.cpp
View File

@ -2982,8 +2982,8 @@ void ToonEngine::restorePalette() {
const char *ToonEngine::getSpecialConversationMusic(int32 conversationId) {
static const char * const specialMusic[] = {
"BR091013", "BR091013",
0, 0,
"BR091013", "BR091013",
"NET1214", "NET1214",
0, 0,
"CAR1365B", "CAR1365B",
@ -2991,6 +2991,7 @@ const char *ToonEngine::getSpecialConversationMusic(int32 conversationId) {
0, 0,
"CAR14431", "CAR14431",
0, 0,
0, 0,
"SCD16520", "SCD16520",
"SCD16520", "SCD16520",
"SCD16522", "SCD16522",
@ -3048,7 +3049,7 @@ const char *ToonEngine::getSpecialConversationMusic(int32 conversationId) {
0, 0
};
return specialMusic[randRange(0, 1) + conversationId * 2];
return specialMusic[randRange(0, 1) + conversationId * 2];
}
void ToonEngine::viewInventoryItem(Common::String str, int32 lineId, int32 itemDest) {