diff options
| author | Martin Kiewitz | 2010-07-14 22:19:05 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-14 22:19:05 +0000 |
| commit | 7c210829dd3b4b3078a5c98bda9a7224165daa82 (patch) | |
| tree | 5416b6dc94ab35875d58a0b3eabdb33cf056a034 /engines/sci/engine | |
| parent | 3195ab099a10cbe13557064fe58a7cabbb981dfd (diff) | |
| download | scummvm-rg350-7c210829dd3b4b3078a5c98bda9a7224165daa82.tar.gz scummvm-rg350-7c210829dd3b4b3078a5c98bda9a7224165daa82.tar.bz2 scummvm-rg350-7c210829dd3b4b3078a5c98bda9a7224165daa82.zip | |
SCI: removing #ifdef ENABLE_SCI32 from one single line (just a waste) and adding it to kDoSound (SCI2.1)
svn-id: r50897
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 0b19cf01ad..a6a3453ed8 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -379,6 +379,7 @@ static const SciKernelMapSubEntry kDoSound_subops[] = { { SIG_SOUNDSCI1LATE, 18, MAP_CALL(DoSoundSendMidi), NULL, NULL }, { SIG_SOUNDSCI1LATE, 19, MAP_CALL(DoSoundReverb), NULL, NULL }, { SIG_SOUNDSCI1LATE, 20, MAP_CALL(DoSoundUpdate), NULL, NULL }, +#ifdef ENABLE_SCI32 { SIG_SOUNDSCI21, 0, MAP_CALL(DoSoundMasterVolume), NULL, NULL }, { SIG_SOUNDSCI21, 1, MAP_CALL(DoSoundMute), NULL, NULL }, { SIG_SOUNDSCI21, 2, MAP_CALL(DoSoundDummy), NULL, NULL }, @@ -405,6 +406,7 @@ static const SciKernelMapSubEntry kDoSound_subops[] = { { SIG_SOUNDSCI21, 18, MAP_CALL(DoSoundSendMidi), NULL, NULL }, { SIG_SOUNDSCI21, 19, MAP_CALL(DoSoundReverb), NULL, NULL }, { SIG_SOUNDSCI21, 20, MAP_CALL(DoSoundUpdate), NULL, NULL }, +#endif SCI_SUBOPENTRY_TERMINATOR }; @@ -457,9 +459,7 @@ static const SciKernelMapSubEntry kPalette_subops[] = { }; static const SciKernelMapSubEntry kFileIO_subops[] = { -#ifdef ENABLE_SCI32 { SIG_SCI32, 0, MAP_CALL(FileIOOpen), "r(i)", NULL }, -#endif { SIG_SCIALL, 0, MAP_CALL(FileIOOpen), "ri", NULL }, { SIG_SCIALL, 1, MAP_CALL(FileIOClose), "i", NULL }, { SIG_SCIALL, 2, MAP_CALL(FileIOReadRaw), "iri", NULL }, |