[Scummvm-cvs-logs] scummvm master -> 0ceeee8148524fc36c3a9b3e7640b987867ecb19
Kirben
kirben at optusnet.com.au
Sun Jan 29 07:09:34 CET 2012
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:
0ceeee8148 SCUMM: Add script number differences in SCUMM V0, for two work arounds in Maniac Mansion.
Commit: 0ceeee8148524fc36c3a9b3e7640b987867ecb19
https://github.com/scummvm/scummvm/commit/0ceeee8148524fc36c3a9b3e7640b987867ecb19
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2012-01-28T22:07:38-08:00
Commit Message:
SCUMM: Add script number differences in SCUMM V0, for two work arounds in Maniac Mansion.
Changed paths:
engines/scumm/script_v2.cpp
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 7f02e89..edb046d 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1171,9 +1171,15 @@ void ScummEngine_v2::o2_startScript() {
// imprisonment of the player), then any attempt to start script 87
// (which makes Ted go answer the door bell) is simply ignored. This
// way, the door bell still chimes, but Ted ignores it.
- if (_game.id == GID_MANIAC && script == 87) {
- if (isScriptRunning(88) || isScriptRunning(89)) {
- return;
+ if (_game.id == GID_MANIAC) {
+ if (_game.version >= 1 && script == 87) {
+ if (isScriptRunning(88) || isScriptRunning(89))
+ return;
+ }
+ // Script numbers are different in V0
+ if (_game.version == 0 && script == 82) {
+ if (isScriptRunning(83) || isScriptRunning(84))
+ return;
}
}
@@ -1189,7 +1195,10 @@ void ScummEngine_v2::o2_stopScript() {
// FIXME: Nasty hack for bug #915575
// Don't let the exit script for room 26 stop the script (116), when
// switching to the dungeon (script 89)
- if ((script == 116) && isScriptRunning(89))
+ if (_game.version >= 1 && script == 116 && isScriptRunning(89))
+ return;
+ // Script numbers are different in V0
+ if (_game.version == 0 && script == 111 && isScriptRunning(84))
return;
}
More information about the Scummvm-git-logs
mailing list