[Scummvm-cvs-logs] SF.net SVN: scummvm: [30110] scummvm/branches/branch-0-11-0/engines/saga/ sfuncs.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Dec 31 23:46:13 CET 2007
Revision: 30110
http://scummvm.svn.sourceforge.net/scummvm/?rev=30110&view=rev
Author: thebluegr
Date: 2007-12-31 14:46:12 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
(backport) Fix for bug #1861126 - "IHNM: Crash when Gorrister cuts sheet in the mooring ring"
Modified Paths:
--------------
scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp
Modified: scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp 2007-12-31 22:45:30 UTC (rev 30109)
+++ scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp 2007-12-31 22:46:12 UTC (rev 30110)
@@ -277,6 +277,23 @@
if (obj->_sceneNumber != ITE_SCENE_INV) {
obj->_sceneNumber = ITE_SCENE_INV;
+ // WORKAROUND for a problematic object in IHNM
+ // There are 3 different scenes in front of the zeppelin, in Gorrister's chapter. A scene where the
+ // zeppelin is in the air (scene 17), a scene where it approaches Gorrister's (scene 16) and another one
+ // where it has landed (scene 18).
+ // In two of these scenes (the "on air" and "approaching" ones), when the player uses the knife with the
+ // rope, the associated script picks up object id 16392. In the "zeppelin landed" scene (scene 18), the
+ // associated script picks up object id 16390. This seems to be a script bug, as it should be id 16392,
+ // like in the other two scenes, as it is the same object (the rope). Picking up object 16390 leads to an
+ // assertion anyway, therefore we change the problematic object (16390) to the correct one (16392) here.
+ // Fixes bug #1861126 - "IHNM: Crash when Gorrister cuts sheet in the mooring ring"
+ if (_vm->getGameType() == GType_IHNM) {
+ if (_vm->_scene->currentChapterNumber() == 1 && _vm->_scene->currentSceneNumber() == 18) {
+ if (objectId == 16390)
+ objectId = 16392;
+ }
+ }
+
// WORKAROUND for two incorrect object sprites in the IHNM demo
// (the mirror and the icon in Ted's part). Set them correctly here
if (_vm->getGameId() == GID_IHNM_DEMO) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list