[Scummvm-git-logs] scummvm master -> a8475db05a209f83bd0d33e4db3e66cfb1c81566

m-kiewitz m_kiewitz at users.sourceforge.net
Tue May 30 22:11:42 CEST 2017


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:
a8475db05a SCI: SQ4CD: Limit workaround for Russian SQ4 to room 150+900


Commit: a8475db05a209f83bd0d33e4db3e66cfb1c81566
    https://github.com/scummvm/scummvm/commit/a8475db05a209f83bd0d33e4db3e66cfb1c81566
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2017-05-30T22:11:33+02:00

Commit Message:
SCI: SQ4CD: Limit workaround for Russian SQ4 to room 150+900

As proposed by bluegr

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


diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index a5c5e6d..3ac5e04 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -565,7 +565,8 @@ const SciWorkaroundEntry kDisposeScript_workarounds[] = {
 	{ GID_QFG1,           -1,    64,  0,               "rm64", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when leaving graveyard, parameter 0 is an object
 	{ GID_SQ4,            -1,   151,  0,        "fightScript", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // during fight with Vohaul, parameter 0 is an object, happens in at least room 150
 	{ GID_SQ4,            -1,   152,  0,       "driveCloseUp", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download", parameter 0 is an object, may happen in room 150 and 900 (900 see bug #9812)
-	{ GID_SQ4,            -1,   152,  0,                   "", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download"... in Russian version - bug #5573
+	{ GID_SQ4,           150,   152,  0,                   "", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download"... in Russian version - bug #5573
+	{ GID_SQ4,           900,   152,  0,                   "", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // same as above, but for "game over" room
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 





More information about the Scummvm-git-logs mailing list