aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-04-29 10:41:28 +0200
committerStrangerke2013-04-29 10:41:28 +0200
commit9d9f9712cedd57afe345126b8fb3c8753945ef14 (patch)
tree59941f235ba4caba7370da533436f8390623fd94
parentb4f5a1a93c9d4b1a6111e3b4cf6ec60bc851c9d7 (diff)
downloadscummvm-rg350-9d9f9712cedd57afe345126b8fb3c8753945ef14.tar.gz
scummvm-rg350-9d9f9712cedd57afe345126b8fb3c8753945ef14.tar.bz2
scummvm-rg350-9d9f9712cedd57afe345126b8fb3c8753945ef14.zip
TSAGE: Fix some non-initialized variables. CID 1002415, 1002416, 1002417, 1002418
-rw-r--r--engines/tsage/converse.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index ba27db9104..de5ac62425 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) {