aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/toon/font.cpp2
-rw-r--r--engines/toon/movie.h1
-rw-r--r--engines/toon/path.cpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/engines/toon/font.cpp b/engines/toon/font.cpp
index e26ed92f83..c01612084e 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 4dd6583bf6..a380853780 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 7914aed595..336847e73c 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) {