[Scummvm-git-logs] scummvm master -> 0ebc6aecd4beb3503a3cdb8cfb0bdaaa31ded8a1

dreammaster dreammaster at scummvm.org
Sun Oct 30 20:22:53 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:
0ebc6aecd4 TITANIC: Add extra field initializations


Commit: 0ebc6aecd4beb3503a3cdb8cfb0bdaaa31ded8a1
    https://github.com/scummvm/scummvm/commit/0ebc6aecd4beb3503a3cdb8cfb0bdaaa31ded8a1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-30T15:22:44-04:00

Commit Message:
TITANIC: Add extra field initializations

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



diff --git a/engines/titanic/true_talk/script_support.cpp b/engines/titanic/true_talk/script_support.cpp
index 14560e2..440cb1a 100644
--- a/engines/titanic/true_talk/script_support.cpp
+++ b/engines/titanic/true_talk/script_support.cpp
@@ -38,7 +38,7 @@ int TTnpcScriptResponse::size() const {
 
 TTscriptRange::TTscriptRange(uint id, const Common::Array<uint> &values,
 		bool isRandom, bool isSequential) :
-		_id(id), _nextP(nullptr) {
+		_id(id), _nextP(nullptr), _priorIndex(0) {
 	_mode = SF_NONE;
 	if (isRandom)
 		_mode = SF_RANDOM;
diff --git a/engines/titanic/true_talk/script_support.h b/engines/titanic/true_talk/script_support.h
index bdaec6e..ffd4f48 100644
--- a/engines/titanic/true_talk/script_support.h
+++ b/engines/titanic/true_talk/script_support.h
@@ -40,6 +40,10 @@ struct TTnpcScriptResponse {
 	uint _tag;
 	uint _values[4];
 
+	TTnpcScriptResponse() : _tag(0) {
+		_values[0] = _values[1] = _values[2] = _values[3] = 0;
+	}
+
 	/**
 	 * Returns the size of the values list plus 1
 	 */
@@ -59,7 +63,6 @@ struct TTscriptRange {
 		bool isSequential);
 };
 
-
 struct TTsentenceEntry {
 	int _field0;
 	int _field4;





More information about the Scummvm-git-logs mailing list