[Scummvm-cvs-logs] SF.net SVN: scummvm:[50800] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 50800
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50800&view=rev
Author:   m_kiewitz
Date:     2010-07-11 11:52:17 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
SCI: changing signature for kDoSound(resume) it seems its called right after restoring to resume music - which we do already automatically

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-11 11:12:03 UTC (rev 50799)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-11 11:52:17 UTC (rev 50800)
@@ -323,7 +323,7 @@
     { SIG_SOUNDSCI0,       4, MAP_CALL(DoSoundMute),               "(i)",                  NULL },
     { SIG_SOUNDSCI0,       5, MAP_CALL(DoSoundStop),               "o",                    NULL },
     { SIG_SOUNDSCI0,       6, MAP_CALL(DoSoundPause),              "i",                    NULL },
-    { SIG_SOUNDSCI0,       7, MAP_CALL(DoSoundResume),             "o",                    NULL },
+    { SIG_SOUNDSCI0,       7, MAP_CALL(DoSoundResume),             "",                     NULL },
     { SIG_SOUNDSCI0,       8, MAP_CALL(DoSoundMasterVolume),       "(i)",                  NULL },
     { SIG_SOUNDSCI0,       9, MAP_CALL(DoSoundUpdate),             "o",                    NULL },
     { SIG_SOUNDSCI0,      10, MAP_CALL(DoSoundFade),               "o",                    NULL },

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-11 11:12:03 UTC (rev 50799)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-11 11:52:17 UTC (rev 50800)
@@ -251,6 +251,9 @@
 
 // SCI0 only command
 reg_t SoundCommandParser::kDoSoundResume(int argc, reg_t *argv, reg_t acc) {
+	// this doesn't seem to do what we think it's doing
+	//  it's called with no arguments at all (just restore a game in qfg1)
+	return acc;
 	reg_t obj = argv[0];
 
 	MusicEntry *musicSlot = _music->getSlot(obj);


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