From 42670975acf72ca52bbf73c0f0c0295b07c0a50a Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 28 Jan 2011 20:52:52 +0000 Subject: SWORD25: Removed a lot of debug/unimplemented/unused functions svn-id: r55600 --- engines/sword25/input/inputengine_script.cpp | 56 +++++----------------------- 1 file changed, 10 insertions(+), 46 deletions(-) (limited to 'engines/sword25/input/inputengine_script.cpp') diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp index f742f56a5a..d4f2719b62 100644 --- a/engines/sword25/input/inputengine_script.cpp +++ b/engines/sword25/input/inputengine_script.cpp @@ -167,58 +167,22 @@ static int wasKeyDown(lua_State *L) { return 1; } -static int setMouseX(lua_State *L) { - InputEngine *pIE = getIE(); - - pIE->setMouseX((int)luaL_checknumber(L, 1)); - return 0; -} - -static int setMouseY(lua_State *L) { - InputEngine *pIE = getIE(); - - pIE->setMouseY((int)luaL_checknumber(L, 1)); - return 0; -} - static void theCharacterCallback(int character) { characterCallbackPtr->_character = static_cast(character); lua_State *L = static_cast(Kernel::getInstance()->getScript()->getScriptObject()); characterCallbackPtr->invokeCallbackFunctions(L, 1); } -static int registerCharacterCallback(lua_State *L) { - luaL_checktype(L, 1, LUA_TFUNCTION); - characterCallbackPtr->registerCallbackFunction(L, 1); - - return 0; -} - -static int unregisterCharacterCallback(lua_State *L) { - luaL_checktype(L, 1, LUA_TFUNCTION); - characterCallbackPtr->unregisterCallbackFunction(L, 1); - - return 0; -} - static void theCommandCallback(int command) { commandCallbackPtr->_command = static_cast(command); lua_State *L = static_cast(Kernel::getInstance()->getScript()->getScriptObject()); commandCallbackPtr->invokeCallbackFunctions(L, 1); } -static int registerCommandCallback(lua_State *L) { - luaL_checktype(L, 1, LUA_TFUNCTION); - commandCallbackPtr->registerCallbackFunction(L, 1); - - return 0; -} - -static int unregisterCommandCallback(lua_State *L) { - luaL_checktype(L, 1, LUA_TFUNCTION); - commandCallbackPtr->unregisterCallbackFunction(L, 1); - - return 0; +// Marks a function that should never be used +static int dummyFuncError(lua_State *L) { + error("Dummy function invoked by LUA"); + return 1; } static const char *PACKAGE_LIBRARY_NAME = "Input"; @@ -233,14 +197,14 @@ static const luaL_reg PACKAGE_FUNCTIONS[] = { {"IsLeftDoubleClick", isLeftDoubleClick}, {"GetMouseX", getMouseX}, {"GetMouseY", getMouseY}, - {"SetMouseX", setMouseX}, - {"SetMouseY", setMouseY}, + {"SetMouseX", dummyFuncError}, + {"SetMouseY", dummyFuncError}, {"IsKeyDown", isKeyDown}, {"WasKeyDown", wasKeyDown}, - {"RegisterCharacterCallback", registerCharacterCallback}, - {"UnregisterCharacterCallback", unregisterCharacterCallback}, - {"RegisterCommandCallback", registerCommandCallback}, - {"UnregisterCommandCallback", unregisterCommandCallback}, + {"RegisterCharacterCallback", dummyFuncError}, // debug + {"UnregisterCharacterCallback", dummyFuncError}, + {"RegisterCommandCallback", dummyFuncError}, + {"UnregisterCommandCallback", dummyFuncError}, {0, 0} }; -- cgit v1.2.3