diff options
Diffstat (limited to 'engines/sword25/input/inputengine_script.cpp')
| -rw-r--r-- | engines/sword25/input/inputengine_script.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp index f68b265297..2f16a21377 100644 --- a/engines/sword25/input/inputengine_script.cpp +++ b/engines/sword25/input/inputengine_script.cpp @@ -36,7 +36,6 @@ #include "common/str.h" #include "sword25/kernel/common.h" #include "sword25/kernel/kernel.h" -#include "sword25/kernel/callbackregistry.h" #include "sword25/script/script.h" #include "sword25/script/luabindhelper.h" #include "sword25/script/luacallback.h" @@ -103,16 +102,6 @@ static int init(lua_State *L) { static int update(lua_State *L) { InputEngine *pIE = getIE(); - // Beim ersten Aufruf der Update()-Methode werden die beiden Callbacks am Input-Objekt registriert. - // Dieses kann nicht in _RegisterScriptBindings() passieren, da diese Funktion vom Konstruktor der abstrakten Basisklasse aufgerufen wird und die - // Register...()-Methoden abstrakt sind, im Konstruktor der Basisklasse also nicht aufgerufen werden können. - static bool firstCall = true; - if (firstCall) { - firstCall = false; - pIE->registerCharacterCallback(theCharacterCallback); - pIE->registerCommandCallback(theCommandCallback); - } - pIE->update(); return 0; } @@ -291,8 +280,8 @@ bool InputEngine::registerScriptBindings() { assert(commandCallbackPtr == 0); commandCallbackPtr = new CommandCallbackClass(L); - CallbackRegistry::instance().registerCallbackFunction("LuaCommandCB", theCommandCallback); - CallbackRegistry::instance().registerCallbackFunction("LuaCharacterCB", theCharacterCallback); + setCharacterCallback(theCharacterCallback); + setCommandCallback(theCommandCallback); return true; } |