[Scummvm-git-logs] scummvm master -> c31efeb8c7279d83e417d33705eeb50046ccef71

[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:
c31efeb8c7 TITANIC: Add missing copyData method to TTnpcScript


Commit: c31efeb8c7279d83e417d33705eeb50046ccef71
    https://github.com/scummvm/scummvm/commit/c31efeb8c7279d83e417d33705eeb50046ccef71
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-04T19:20:11-05:00

Commit Message:
TITANIC: Add missing copyData method to TTnpcScript

Changed paths:
    engines/titanic/true_talk/tt_npc_script.cpp
    engines/titanic/true_talk/tt_npc_script.h


diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index ba205b6..990f227 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -113,6 +113,13 @@ void TTnpcData::resetFlags() {
 	Common::fill(&_array[20], &_array[136], 0);
 }
 
+void TTnpcData::copyData() {
+	if (_array[20]) {
+		Common::copy_backward(&_array[16], &_array[136], &_array[24]);
+		Common::fill(&_array[20], &_array[28], 0);
+	}
+}
+
 /*------------------------------------------------------------------------*/
 
 TTnpcScriptBase::TTnpcScriptBase(int charId_, const char *charClass, int v2,
@@ -803,6 +810,7 @@ TTscriptRange *TTnpcScript::findRange(uint id) {
 }
 
 void TTnpcScript::checkItems(const TTroomScript *roomScript, const TTsentence *sentence) {
+	_data.copyData();
 	_field2CC = 0;
 	++CTrueTalkManager::_v2;
 
diff --git a/engines/titanic/true_talk/tt_npc_script.h b/engines/titanic/true_talk/tt_npc_script.h
index e5be7d7..c2f001f 100644
--- a/engines/titanic/true_talk/tt_npc_script.h
+++ b/engines/titanic/true_talk/tt_npc_script.h
@@ -43,6 +43,8 @@ public:
 	int &operator[](int idx) { return _array[idx]; }
 	int *getSlot(int idx) { return &_array[16 + idx * 4]; }
 	void resetFlags();
+
+	void copyData();
 };
 
 class TTnpcScriptBase : public TTscriptBase {