[Scummvm-cvs-logs] SF.net SVN: scummvm:[50897] scummvm/trunk/engines/sci/engine/kernel.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50897
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50897&view=rev
Author:   m_kiewitz
Date:     2010-07-14 22:19:05 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
SCI: removing #ifdef ENABLE_SCI32 from one single line (just a waste) and adding it to kDoSound (SCI2.1)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-14 22:07:36 UTC (rev 50896)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-14 22:19:05 UTC (rev 50897)
@@ -379,6 +379,7 @@
     { 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 @@
     { 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 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 },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.