[Scummvm-git-logs] scummvm master -> dc58af2749a0638a1d060ae87ef17266d583f217
dreammaster
dreammaster at scummvm.org
Fri Dec 16 05:12:32 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:
dc58af2749 TITANIC: Extra initialization of TTconcept fields
Commit: dc58af2749a0638a1d060ae87ef17266d583f217
https://github.com/scummvm/scummvm/commit/dc58af2749a0638a1d060ae87ef17266d583f217
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-15T23:12:29-05:00
Commit Message:
TITANIC: Extra initialization of TTconcept fields
Changed paths:
engines/titanic/true_talk/tt_concept.cpp
diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
index cd24d7c..5d53860 100644
--- a/engines/titanic/true_talk/tt_concept.cpp
+++ b/engines/titanic/true_talk/tt_concept.cpp
@@ -28,7 +28,8 @@
namespace Titanic {
TTconcept::TTconcept() : _string1(" "), _string2(" "),
- _scriptP(nullptr), _wordP(nullptr), _status(SS_VALID) {
+ _nextP(nullptr), _scriptP(nullptr), _wordP(nullptr), _status(SS_VALID),
+ _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
if (setStatus())
setScriptType(ST_UNKNOWN_SCRIPT);
else
@@ -36,8 +37,8 @@ TTconcept::TTconcept() : _string1(" "), _string2(" "),
}
TTconcept::TTconcept(TTscriptBase *script, ScriptType scriptType) :
- _string1(" "), _string2(" "), _wordP(nullptr), _scriptP(nullptr),
- _status(SS_VALID) {
+ _string1(" "), _string2(" "), _nextP(nullptr), _wordP(nullptr), _scriptP(nullptr),
+ _status(SS_VALID), _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
if (!script->getStatus()) {
setScriptType(scriptType);
_scriptP = script;
@@ -51,8 +52,8 @@ TTconcept::TTconcept(TTscriptBase *script, ScriptType scriptType) :
}
TTconcept::TTconcept(TTword *word, ScriptType scriptType) :
- _string1(" "), _string2(" "), _wordP(nullptr), _scriptP(nullptr),
- _status(SS_VALID) {
+ _string1(" "), _string2(" "), _nextP(nullptr), _wordP(nullptr), _scriptP(nullptr),
+ _status(SS_VALID), _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
if (!word || !setStatus() || word->getStatus()) {
_status = SS_5;
} else {
@@ -66,8 +67,9 @@ TTconcept::TTconcept(TTword *word, ScriptType scriptType) :
}
TTconcept::TTconcept(TTconcept &src) :
- _string1(src._string1), _string2(src._string2),
- _wordP(nullptr), _scriptP(nullptr), _status(SS_VALID) {
+ _string1(src._string1), _string2(src._string2), _nextP(nullptr),
+ _wordP(nullptr), _scriptP(nullptr), _status(SS_VALID),
+ _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
if (src.getStatus()) {
_status = SS_5;
} else {
More information about the Scummvm-git-logs
mailing list