[Scummvm-cvs-logs] scummvm master -> 69b4ae6c6c612a5e130b0efca5a3c4869688f965

[dreammaster]

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:
69b4ae6c6c SHERLOCK: RT: Fix loading talk/script statements


Commit: 69b4ae6c6c612a5e130b0efca5a3c4869688f965
    https://github.com/scummvm/scummvm/commit/69b4ae6c6c612a5e130b0efca5a3c4869688f965
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-12T20:53:56-04:00

Commit Message:
SHERLOCK: RT: Fix loading talk/script statements

Changed paths:
    engines/sherlock/talk.cpp
    engines/sherlock/talk.h



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b27ff3a..5127d1e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -39,7 +39,7 @@ SequenceEntry::SequenceEntry() {
 
 /*----------------------------------------------------------------*/
 
-void Statement::synchronize(Common::SeekableReadStream &s) {
+void Statement::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	int length;
 
 	length = s.readUint16LE();
@@ -73,6 +73,7 @@ void Statement::synchronize(Common::SeekableReadStream &s) {
 
 	_portraitSide = s.readByte();
 	_quotient = s.readUint16LE();
+	_journal = isRoseTattoo ? s.readByte() : 0;
 }
 
 /*----------------------------------------------------------------*/
@@ -581,7 +582,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 
 	_statements.resize(talkStream->readByte());
 	for (uint idx = 0; idx < _statements.size(); ++idx)
-		_statements[idx].synchronize(*talkStream);
+		_statements[idx].load(*talkStream, IS_ROSE_TATTOO);
 
 	delete talkStream;
 
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index e47f2d9..9c44f8e 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -144,11 +144,12 @@ struct Statement {
 	int _quotient;
 	int _talkMap;
 	Common::Rect _talkPos;
+	int _journal;
 
 	/**
 	 * Load the data for a single statement within a talk file
 	 */
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
 };
 
 struct TalkHistoryEntry {