[Scummvm-cvs-logs] scummvm master -> eadbe2b8b87777ab92234264a4be990be74f03ad
dreammaster
dreammaster at scummvm.org
Fri Aug 7 22:03:14 CEST 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:
eadbe2b8b8 SHERLOCK: RT: Fix crash executing scripts that clear their own data
Commit: eadbe2b8b87777ab92234264a4be990be74f03ad
https://github.com/scummvm/scummvm/commit/eadbe2b8b87777ab92234264a4be990be74f03ad
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-07T16:02:19-04:00
Commit Message:
SHERLOCK: RT: Fix crash executing scripts that clear their own data
Changed paths:
engines/sherlock/talk.cpp
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b347bd4..83596e4 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -339,7 +339,8 @@ void Talk::talkTo(const Common::String &filename) {
_scriptSelect = select;
_speaker = _talkTo;
- Statement &statement = _statements[select];
+ // Make a copy of the statement (in case the script frees the statement list), and then execute it
+ Statement statement = _statements[select];
doScript(_statements[select]._reply);
if (IS_ROSE_TATTOO) {
More information about the Scummvm-git-logs
mailing list