[Scummvm-git-logs] scummvm master -> 88c80318cd6b0fbcfd50b4a75e092f665f985fbf

[bluegr]

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

Summary:
88c80318cd Revert "SCI: SQ4 intro - stop puker alien's sound"


Commit: 88c80318cd6b0fbcfd50b4a75e092f665f985fbf
    https://github.com/scummvm/scummvm/commit/88c80318cd6b0fbcfd50b4a75e092f665f985fbf
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-09-04T22:46:43+03:00

Commit Message:
Revert "SCI: SQ4 intro - stop puker alien's sound"

We need to find the actual interpreter difference that causes this bug,
and not patch scenes in this manner, as this bug does not occur with
the original. There is still no explanation why this bug occurs in
ScummVM, so it's best to revert the inserted script code, as it caused
a regression in bug #11671.

This reverts commit 6216f855a801eba65727392a67f29224f38ea2e9.

Changed paths:
    engines/sci/engine/vm_hooks.cpp


diff --git a/engines/sci/engine/vm_hooks.cpp b/engines/sci/engine/vm_hooks.cpp
index 49d852cade..7a6476c719 100644
--- a/engines/sci/engine/vm_hooks.cpp
+++ b/engines/sci/engine/vm_hooks.cpp
@@ -121,23 +121,10 @@ static const byte sci0_hebrew_input_prompt[] = {
 };
 
 
-// solves one of the issues described at #11265 - the puker alien's sound is still heard on next room
-// it seems like a script bug, which assumes the sound to be always 4 seconds, while it has varying length
-// depending on whether it's digital or midi (both are longer than 4 seconds...)
-// we solve that by calling:
-// (gLongSong2 stop:)
-const byte sq4_puker_stop_sound[] = {
-	0x38, 0xa7, 0x00,               // pushi    #stop
-	0x76,                           // push0
-	0x81, 0x9a,                     // lag      gLongSong2
-	0x4a, 0x04                      // send     4
-};
-
-
 
 /** Write here all games hooks
  *  From this we'll build _hooksMap, which contains only relevant hooks to current game
- *  The match is performed according to PC (of next instruction to execute), script number, opcode (only opcode name, as seen in ScummVM debugger),
+ *  The match is performed according to PC, script number, opcode (only opcode name, as seen in ScummVM debugger),
  *  and either:
  *  - objName and selector	(and then externID is -1)
  *  - external function ID  (and then selector is "")
@@ -146,15 +133,11 @@ const byte sq4_puker_stop_sound[] = {
 
 static const GeneralHookEntry allGamesHooks[] = {
 	// GID, script, lang,        PC.offset, objName,  selector,  externID, opcode,  hook array
-	{GID_QFG1, Common::UNK_LANG, {58,  0x144d}, {"egoRuns", "changeState",   -1 , "push0", HOOKARRAY(qfg1_die_after_running_on_ice)}},
-	{GID_SQ3,  Common::HE_ISR,   {255, 0x1103}, {"User",    "",              -1 , "pushi", HOOKARRAY(sci0_hebrew_input_prompt)}},
-	{GID_SQ4 , Common::UNK_LANG, {15, 0x07d7},  {"barScript", "changeState", -1 , "pushi", HOOKARRAY(sq4_puker_stop_sound)} }
+	{GID_QFG1, Common::UNK_LANG, {58,  0x144d}, {"egoRuns", "changeState", -1 , "push0", HOOKARRAY(qfg1_die_after_running_on_ice)}},
+	{GID_SQ3,  Common::HE_ISR,   {255, 0x1103}, {"User",    "",            -1 , "pushi", HOOKARRAY(sci0_hebrew_input_prompt)}}
 };
 
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
 VmHooks::VmHooks() {
 	// build _hooksMap
 	for (uint i = 0; i < ARRAYSIZE(allGamesHooks); i++) {