[Scummvm-cvs-logs] scummvm master -> c02073ff9ac369a86968e35c8b32bc7488bbaab8

Strangerke Strangerke at scummvm.org
Sun Oct 27 00:29:46 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:
c02073ff9a TSAGE: Fix CID 1002365, 1002366, 1107569


Commit: c02073ff9ac369a86968e35c8b32bc7488bbaab8
    https://github.com/scummvm/scummvm/commit/c02073ff9ac369a86968e35c8b32bc7488bbaab8
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-26T15:28:41-07:00

Commit Message:
TSAGE: Fix CID 1002365, 1002366, 1107569

Changed paths:
    engines/tsage/sound.cpp
    engines/tsage/tsage.cpp
    engines/tsage/user_interface.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 844cfc1..195ba5c 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -2540,6 +2540,11 @@ PlayStream::PlayStream(): EventHandler() {
 	_index = NULL;
 	_endAction = NULL;
 	_audioStream = NULL;
+
+	_resData._fileChunkSize = 0;
+	_resData._indexSize = 0;
+	_resData._chunkSize = 0;
+	_voiceNum = 0;
 }
 
 PlayStream::~PlayStream() {
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index d4ee97f..9956d5c 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -38,6 +38,7 @@ TSageEngine::TSageEngine(OSystem *system, const tSageGameDescription *gameDesc)
 		_gameDescription(gameDesc) {
 	g_vm = this;
 	DebugMan.addDebugChannel(kRingDebugScripts, "scripts", "Scripts debugging");
+	_debugger = nullptr;
 	if (g_vm->getFeatures() & GF_DEMO)
 		_debugger = new DemoDebugger();
 	else if (g_vm->getGameID() == GType_Ringworld)
diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index cb8d3c8..c7053a0 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -307,6 +307,10 @@ UIElements::UIElements(): UICollection() {
 	else
 		_cursorVisage.setVisage(1, 5);
 	g_saver->addLoadNotifier(&UIElements::loadNotifierProc);
+
+	_slotStart = 0;
+	_scoreValue = 0;
+	_active = false;
 }
 
 void UIElements::synchronize(Serializer &s) {






More information about the Scummvm-git-logs mailing list