[Scummvm-cvs-logs] scummvm master -> 531292e04e7312f97f3e88e0934939a6bfb5018d

dreammaster dreammaster at scummvm.org
Sun Oct 4 03:25:08 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:
531292e04e SHERLOCK: SS: Fix freeze when using flower on flask


Commit: 531292e04e7312f97f3e88e0934939a6bfb5018d
    https://github.com/scummvm/scummvm/commit/531292e04e7312f97f3e88e0934939a6bfb5018d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-03T21:24:38-04:00

Commit Message:
SHERLOCK: SS: Fix freeze when using flower on flask

Changed paths:
    engines/sherlock/scalpel/scalpel_talk.h



diff --git a/engines/sherlock/scalpel/scalpel_talk.h b/engines/sherlock/scalpel/scalpel_talk.h
index 4d54273..a9a3753 100644
--- a/engines/sherlock/scalpel/scalpel_talk.h
+++ b/engines/sherlock/scalpel/scalpel_talk.h
@@ -145,7 +145,7 @@ public:
 	/**
 	 * Returns true if the script stack is empty
 	 */
-	virtual bool isSequencesEmpty() const { return _scriptStack.empty(); }
+	virtual bool isSequencesEmpty() const { return _sequenceStack.empty(); }
 
 	/**
 	 * Clears the stack of pending object sequences associated with speakers in the scene






More information about the Scummvm-git-logs mailing list