diff options
Diffstat (limited to 'engines/sword25/gfx')
-rw-r--r-- | engines/sword25/gfx/graphicengine.cpp | 1 | ||||
-rw-r--r-- | engines/sword25/gfx/graphicengine.h | 1 | ||||
-rw-r--r-- | engines/sword25/gfx/graphicengine_script.cpp | 19 |
3 files changed, 17 insertions, 4 deletions
diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp index 37499cc14d..54aa243cd8 100644 --- a/engines/sword25/gfx/graphicengine.cpp +++ b/engines/sword25/gfx/graphicengine.cpp @@ -85,6 +85,7 @@ GraphicEngine::GraphicEngine(Kernel *pKernel) : } GraphicEngine::~GraphicEngine() { + unregisterScriptBindings(); _backSurface.free(); _frameBuffer.free(); delete _thumbnail; diff --git a/engines/sword25/gfx/graphicengine.h b/engines/sword25/gfx/graphicengine.h index 5820a8d420..26eeaa2e22 100644 --- a/engines/sword25/gfx/graphicengine.h +++ b/engines/sword25/gfx/graphicengine.h @@ -363,6 +363,7 @@ protected: private: bool registerScriptBindings(); + void unregisterScriptBindings(); // LastFrameDuration Variables // --------------------------- diff --git a/engines/sword25/gfx/graphicengine_script.cpp b/engines/sword25/gfx/graphicengine_script.cpp index 956c0352f0..fa97b80c82 100644 --- a/engines/sword25/gfx/graphicengine_script.cpp +++ b/engines/sword25/gfx/graphicengine_script.cpp @@ -71,8 +71,8 @@ protected: } }; -Common::ScopedPtr<LuaCallback> loopPointCallbackPtr; -Common::ScopedPtr<ActionCallback> actionCallbackPtr; +static LuaCallback *loopPointCallbackPtr = 0; // FIXME: should be turned into GraphicEngine member var +static ActionCallback *actionCallbackPtr = 0; // FIXME: should be turned into GraphicEngine member var struct CallbackfunctionRegisterer { CallbackfunctionRegisterer() { @@ -1289,10 +1289,21 @@ bool GraphicEngine::registerScriptBindings() { if (!LuaBindhelper::addFunctionsToLib(L, GFX_LIBRARY_NAME, GFX_FUNCTIONS)) return false; - loopPointCallbackPtr.reset(new LuaCallback(L)); - actionCallbackPtr.reset(new ActionCallback(L)); + assert(loopPointCallbackPtr == 0); + loopPointCallbackPtr = new LuaCallback(L); + + assert(actionCallbackPtr == 0); + actionCallbackPtr = new ActionCallback(L); return true; } +void GraphicEngine::unregisterScriptBindings() { + delete loopPointCallbackPtr; + loopPointCallbackPtr = 0; + + delete actionCallbackPtr; + actionCallbackPtr = 0; +} + } // End of namespace Sword25 |