From 29fb3b0f3fca31c36f13175627f9bc06effe8e97 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 30 Oct 2009 22:50:21 +0000 Subject: Plugged some memory leaks in the new graphics code svn-id: r45550 --- engines/sci/gui/gui.cpp | 6 ++++++ engines/sci/gui/gui_font.cpp | 1 + engines/sci/gui/gui_text.cpp | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 15087adf4d..90695b7f7d 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -68,6 +68,12 @@ SciGui::SciGui() { } SciGui::~SciGui() { + delete _controls; + delete _windowMgr; + delete _text; + delete _animate; + delete _transitions; + delete _gfx; } void SciGui::resetEngineState(EngineState *s) { diff --git a/engines/sci/gui/gui_font.cpp b/engines/sci/gui/gui_font.cpp index d903d18f4c..1ae82d491b 100644 --- a/engines/sci/gui/gui_font.cpp +++ b/engines/sci/gui/gui_font.cpp @@ -57,6 +57,7 @@ SciGuiFont::SciGuiFont(ResourceManager *resMan, GuiResourceId resourceId) } SciGuiFont::~SciGuiFont() { + delete _chars; _resMan->unlockResource(_resource); } diff --git a/engines/sci/gui/gui_text.cpp b/engines/sci/gui/gui_text.cpp index 91cc02a0f5..329bf5a2ce 100644 --- a/engines/sci/gui/gui_text.cpp +++ b/engines/sci/gui/gui_text.cpp @@ -41,12 +41,15 @@ SciGuiText::SciGuiText(ResourceManager *resMan, SciGuiGfx *gfx, SciGuiScreen *sc } SciGuiText::~SciGuiText() { + delete _font; } void SciGuiText::init() { _font = NULL; - _codeFonts = NULL; _codeFontsCount = 0; - _codeColors = NULL; _codeColorsCount = 0; + _codeFonts = NULL; + _codeFontsCount = 0; + _codeColors = NULL; + _codeColorsCount = 0; } GuiResourceId SciGuiText::GetFontId() { -- cgit v1.2.3