[Scummvm-cvs-logs] scummvm master -> b45e706012d7131035867fdd1e6f7109db1ae635
bluegr
bluegr at gmail.com
Tue Feb 17 00:51:02 CET 2015
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:
b45e706012 ZVISION: Fix script bug #6803 (tuning fork box state)
Commit: b45e706012d7131035867fdd1e6f7109db1ae635
https://github.com/scummvm/scummvm/commit/b45e706012d7131035867fdd1e6f7109db1ae635
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-02-17T01:49:59+02:00
Commit Message:
ZVISION: Fix script bug #6803 (tuning fork box state)
Changed paths:
engines/zvision/scripting/scr_file_handling.cpp
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index a9f3a55..edc1b86 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -86,6 +86,15 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre
parseCriteria(stream, puzzle->criteriaList, puzzle->key);
} else if (line.matchString("results {", true)) {
parseResults(stream, puzzle->resultActions);
+
+ // WORKAROUND for a script bug in Zork Nemesis, room ve5e (tuning
+ // fork box closeup). If the player leaves the screen while the
+ // box is open, puzzle 19398 shows the animation where the box
+ // closes, but the box state (state variable 19397) is not updated.
+ // We insert the missing assignment for the box state here.
+ // Fixes bug #6803.
+ if (_engine->getGameId() == GID_NEMESIS && puzzle->key == 19398)
+ puzzle->resultActions.push_back(new ActionAssign(_engine, 11, "19397, 0"));
} else if (line.matchString("flags {", true)) {
setStateFlag(puzzle->key, parseFlags(stream));
}
More information about the Scummvm-git-logs
mailing list