[Scummvm-cvs-logs] scummvm master -> 77ac07baf271b08cabb3bf6f2c0022aeb171bf89

[Strangerke]

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:
77ac07baf2 TOON: Fix CID 1002430, 1002431, 1002727


Commit: 77ac07baf271b08cabb3bf6f2c0022aeb171bf89
    https://github.com/scummvm/scummvm/commit/77ac07baf271b08cabb3bf6f2c0022aeb171bf89
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-29T16:56:36-07:00

Commit Message:
TOON: Fix CID 1002430, 1002431, 1002727

Changed paths:
    engines/toon/font.cpp
    engines/toon/movie.h
    engines/toon/path.cpp



diff --git a/engines/toon/font.cpp b/engines/toon/font.cpp
index e26ed92..c016120 100644
--- a/engines/toon/font.cpp
+++ b/engines/toon/font.cpp
@@ -32,6 +32,8 @@ FontRenderer::FontRenderer(ToonEngine *vm) : _vm(vm) {
 	_currentFontColor[1] = 0xc8;
 	_currentFontColor[2] = 0xcb;
 	_currentFontColor[3] = 0xce;
+
+	_currentFont = nullptr;
 }
 
 FontRenderer::~FontRenderer() {
diff --git a/engines/toon/movie.h b/engines/toon/movie.h
index 4dd6583..a380853 100644
--- a/engines/toon/movie.h
+++ b/engines/toon/movie.h
@@ -55,7 +55,6 @@ public:
 protected:
 	bool playVideo(bool isFirstIntroVideo);
 	ToonEngine *_vm;
-	Audio::Mixer *_mixer;
 	ToonstruckSmackerDecoder *_decoder;
 	bool _playing;
 };
diff --git a/engines/toon/path.cpp b/engines/toon/path.cpp
index 7914aed..336847e 100644
--- a/engines/toon/path.cpp
+++ b/engines/toon/path.cpp
@@ -152,6 +152,8 @@ PathFinding::PathFinding() {
 	_heap = new PathFindingHeap();
 	_sq = NULL;
 	_numBlockingRects = 0;
+
+	_currentMask = nullptr;
 }
 
 PathFinding::~PathFinding(void) {