[Scummvm-cvs-logs] scummvm master -> 9d9f9712cedd57afe345126b8fb3c8753945ef14

Strangerke Strangerke at scummvm.org
Mon Apr 29 10:42:45 CEST 2013


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:
9d9f9712ce TSAGE: Fix some non-initialized variables. CID 1002415, 1002416, 1002417, 1002418


Commit: 9d9f9712cedd57afe345126b8fb3c8753945ef14
    https://github.com/scummvm/scummvm/commit/9d9f9712cedd57afe345126b8fb3c8753945ef14
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-04-29T01:41:28-07:00

Commit Message:
TSAGE: Fix some non-initialized variables. CID 1002415, 1002416, 1002417, 1002418

Changed paths:
    engines/tsage/converse.cpp



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index ba27db9..de5ac62 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -42,6 +42,8 @@ SequenceManager::SequenceManager() : Action() {
 	_objectIndex = 0;
 	_keepActive = false;
 	_onCallback = NULL;
+	for (int i = 0; i < 6; i ++)
+		_objectList[i] = NULL;
 	setup();
 }
 
@@ -415,6 +417,8 @@ ConversationChoiceDialog::ConversationChoiceDialog() {
 	_stdColor = 23;
 	_highlightColor = g_globals->_scenePalette._colors.background;
 	_fontNumber = 1;
+	_savedFgColor = _savedFontNumber = 0;
+	_selectedIndex = 0;
 }
 
 int ConversationChoiceDialog::execute(const Common::StringArray &choiceList) {
@@ -587,6 +591,8 @@ StripManager::StripManager() {
 	_activeSpeaker = NULL;
 	_onBegin = NULL;
 	_onEnd = NULL;
+	_sceneNumber = 0;
+	_lookupList = NULL;
 	reset();
 }
 
@@ -932,6 +938,7 @@ Speaker::Speaker() : EventHandler() {
 	_color1 = _color2 = _color3 = g_globals->_scenePalette._colors.foreground;
 	_action = NULL;
 	_speakerName = "SPEAKER";
+	_oldSceneNumber = -1;
 }
 
 void Speaker::synchronize(Serializer &s) {






More information about the Scummvm-git-logs mailing list