[Scummvm-cvs-logs] scummvm master -> ebd080b219300ad0533530bd7f7a0c252bfacbf2
dreammaster
dreammaster at scummvm.org
Fri Oct 16 02:56:40 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:
ebd080b219 SHERLOCK: RT: Fix conversation options screwup after viewing journal
Commit: ebd080b219300ad0533530bd7f7a0c252bfacbf2
https://github.com/scummvm/scummvm/commit/ebd080b219300ad0533530bd7f7a0c252bfacbf2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-15T20:56:02-04:00
Commit Message:
SHERLOCK: RT: Fix conversation options screwup after viewing journal
Changed paths:
engines/sherlock/talk.cpp
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 795c4eb..f324f19 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -575,6 +575,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
_converseNum = res.resourceIndex();
talkStream->skip(2); // Skip talk file version num
+ _statements.clear();
_statements.resize(talkStream->readByte());
for (uint idx = 0; idx < _statements.size(); ++idx)
_statements[idx].load(*talkStream, IS_ROSE_TATTOO);
More information about the Scummvm-git-logs
mailing list