[Scummvm-cvs-logs] scummvm master -> 01666659264ece2cd33b0ecc53dd5fc8c3d7de5c

bluegr md5 at scummvm.org
Wed Oct 12 12:02:54 CEST 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
497c3e75b4 SCI: Marked functions that have been changed into dummy ones in SCI3
0166665926 SCI: Fixed a long-standing bug in kDoSound(init)


Commit: 497c3e75b40ac7ffb81562f19dc68c901faeb693
    https://github.com/scummvm/scummvm/commit/497c3e75b40ac7ffb81562f19dc68c901faeb693
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-12T02:49:38-07:00

Commit Message:
SCI: Marked functions that have been changed into dummy ones in SCI3

Changed paths:
    engines/sci/engine/kernel_tables.h




Commit: 01666659264ece2cd33b0ecc53dd5fc8c3d7de5c
    https://github.com/scummvm/scummvm/commit/01666659264ece2cd33b0ecc53dd5fc8c3d7de5c
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-12T02:49:39-07:00

Commit Message:
SCI: Fixed a long-standing bug in kDoSound(init)

The sound handle should not be set in kDoSound(init), but in
kDoSound(play). This is verified against several SCI versions,
plus game scripts check if a sound slot is playing primarily
by checking its handle. Fixes the sound in Shivers and probably
an assortment of other sound related bugs

Changed paths:
    engines/sci/sound/soundcmd.cpp



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index e7d294d..6391985 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -133,8 +133,6 @@ void SoundCommandParser::processInitSound(reg_t obj) {
 			writeSelectorValue(_segMan, obj, SELECTOR(state), kSoundInitialized);
 		else
 			writeSelector(_segMan, obj, SELECTOR(nodePtr), obj);
-
-		writeSelector(_segMan, obj, SELECTOR(handle), obj);
 	}
 }
 






More information about the Scummvm-git-logs mailing list