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

[m_kiewitz at users.sourceforge.net]

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

Log Message:
-----------
SCI: renaming kDoSound(resume) to resumeAfterRestore

kDoSound(resumeAfterRestore) is called right after restoring a saved game for sound-sci0 games, we already resume playing music inside restore, so we don't need to implement this at all

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-20 10:00:18 UTC (rev 51057)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-20 11:17:33 UTC (rev 51058)
@@ -337,7 +337,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),             "",                     NULL },
+    { SIG_SOUNDSCI0,       7, MAP_CALL(DoSoundResumeAfterRestore), "",                     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/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h	2010-07-20 10:00:18 UTC (rev 51057)
+++ scummvm/trunk/engines/sci/engine/kernel.h	2010-07-20 11:17:33 UTC (rev 51058)
@@ -475,7 +475,7 @@
 reg_t kDoSoundStop(EngineState *s, int argc, reg_t *argv);
 reg_t kDoSoundStopAll(EngineState *s, int argc, reg_t *argv);
 reg_t kDoSoundPause(EngineState *s, int argc, reg_t *argv);
-reg_t kDoSoundResume(EngineState *s, int argc, reg_t *argv);
+reg_t kDoSoundResumeAfterRestore(EngineState *s, int argc, reg_t *argv);
 reg_t kDoSoundMasterVolume(EngineState *s, int argc, reg_t *argv);
 reg_t kDoSoundUpdate(EngineState *s, int argc, reg_t *argv);
 reg_t kDoSoundFade(EngineState *s, int argc, reg_t *argv);

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2010-07-20 10:00:18 UTC (rev 51057)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2010-07-20 11:17:33 UTC (rev 51058)
@@ -54,7 +54,7 @@
 CREATE_DOSOUND_FORWARD(DoSoundStop)
 CREATE_DOSOUND_FORWARD(DoSoundStopAll)
 CREATE_DOSOUND_FORWARD(DoSoundPause)
-CREATE_DOSOUND_FORWARD(DoSoundResume)
+CREATE_DOSOUND_FORWARD(DoSoundResumeAfterRestore)
 CREATE_DOSOUND_FORWARD(DoSoundMasterVolume)
 CREATE_DOSOUND_FORWARD(DoSoundUpdate)
 CREATE_DOSOUND_FORWARD(DoSoundFade)

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-20 10:00:18 UTC (rev 51057)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-20 11:17:33 UTC (rev 51058)
@@ -250,21 +250,10 @@
 }
 
 // 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)
+//  It's called right after restoring a game - it's responsible to kick off playing music again
+//  we don't need this at all, so we don't do anything here
+reg_t SoundCommandParser::kDoSoundResumeAfterRestore(int argc, reg_t *argv, reg_t acc) {
 	return acc;
-	reg_t obj = argv[0];
-
-	MusicEntry *musicSlot = _music->getSlot(obj);
-	if (!musicSlot) {
-		warning("kDoSound(resume):: Slot not found (%04x:%04x)", PRINT_REG(obj));
-		return acc;
-	}
-
-	writeSelectorValue(_segMan, musicSlot->soundObj, SELECTOR(state), kSoundPlaying);
-	_music->soundResume(musicSlot);
-	return acc;
 }
 
 reg_t SoundCommandParser::kDoSoundMute(int argc, reg_t *argv, reg_t acc) {

Modified: scummvm/trunk/engines/sci/sound/soundcmd.h
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.h	2010-07-20 10:00:18 UTC (rev 51057)
+++ scummvm/trunk/engines/sci/sound/soundcmd.h	2010-07-20 11:17:33 UTC (rev 51058)
@@ -85,7 +85,7 @@
 	reg_t kDoSoundDummy(int argc, reg_t *argv, reg_t acc);
 	reg_t kDoSoundMute(int argc, reg_t *argv, reg_t acc);
 	reg_t kDoSoundPause(int argc, reg_t *argv, reg_t acc);
-	reg_t kDoSoundResume(int argc, reg_t *argv, reg_t acc);
+	reg_t kDoSoundResumeAfterRestore(int argc, reg_t *argv, reg_t acc);
 	reg_t kDoSoundStop(int argc, reg_t *argv, reg_t acc);
 	reg_t kDoSoundStopAll(int argc, reg_t *argv, reg_t acc);
 	reg_t kDoSoundDispose(int argc, reg_t *argv, reg_t acc);


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