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

dreammaster dreammaster at scummvm.org
Fri Dec 16 05:26:49 CET 2016


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:
f29a2f31f1 TITANIC: Fix saving and loading of NPC dial values


Commit: f29a2f31f1e37ee733f1015c3d36df798c755172
    https://github.com/scummvm/scummvm/commit/f29a2f31f1e37ee733f1015c3d36df798c755172
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-15T23:26:44-05:00

Commit Message:
TITANIC: Fix saving and loading of NPC dial values

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


diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index 527e33f..7540a73 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -406,9 +406,10 @@ void TTnpcScript::save(SimpleFile *file) {
 	file->writeNumber(_dialDelta);
 	file->writeNumber(_field7C);
 
+	// Write out the dial values
 	file->writeNumber(10);
 	for (int idx = 0; idx < 10; ++idx)
-		file->writeNumber(_data[idx]);
+		file->writeNumber(_dialValues[idx]);
 }
 
 void TTnpcScript::load(SimpleFile *file) {
@@ -423,11 +424,12 @@ void TTnpcScript::load(SimpleFile *file) {
 	for (int idx = count; idx > 4; --idx)
 		file->readNumber();
 
+	// Read in the dial values
 	count = file->readNumber();
 	for (int idx = 0; idx < count; ++idx) {
 		int v = file->readNumber();
 		if (idx < 10)
-			_data[idx] = v;
+			_dialValues[idx] = v;
 	}
 }
 





More information about the Scummvm-git-logs mailing list