libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 02:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In SCI32, kDoAudio subop 10 is no longer CD audio. Just stub it off for now.

Browse Source 
svn-id: r50134
This commit is contained in:
Matthew Hoops 2010-06-21 22:58:33 +00:00
parent b5dffc5aa3
commit 727841ef91
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/sci/engine/ksound.cpp
View File

@ -174,21 +174,30 @@ reg_t kDoAudio(EngineState *s, int argc, reg_t *argv) {
}
break;
case kSciAudioCD:
debugC(2, kDebugLevelSound, "kDoAudio: CD audio subop");
return kDoCdAudio(s, argc - 1, argv + 1);
if (getSciVersion() <= SCI_VERSION_1_1) {
debugC(2, kDebugLevelSound, "kDoAudio: CD audio subop");
return kDoCdAudio(s, argc - 1, argv + 1);
#ifdef ENABLE_SCI32
} else {
// TODO: This isn't CD Audio in SCI32 anymore
warning("kDoAudio: Unhandled case 10, %d extra arguments passed", argc - 1);
break;
#endif
}
// 3 new subops in Pharkas. kDoAudio in Pharkas sits at seg026:038C
case 11:
warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
warning("kDoAudio: Unhandled case 11, %d extra arguments passed", argc - 1);
break;
case 12:
// Seems to be audio sync, used in Pharkas. Silenced the warning due to
// the high level of spam it produces.
//warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
//warning("kDoAudio: Unhandled case 12, %d extra arguments passed", argc - 1);
break;
case 13:
// Used in Pharkas whenever a speech sample starts
warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
warning("kDoAudio: Unhandled case 13, %d extra arguments passed", argc - 1);
break;
default:
warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);