diff options
author | Eugene Sandulenko | 2010-08-06 13:13:25 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 22:35:55 +0000 |
commit | 47904bc7b2992189bb554833f00a79ff0fea9fb8 (patch) | |
tree | 1cec51758c6741b970bd064fafee77607b9f884f /engines/sword25/input/inputengine_script.cpp | |
parent | ca17def625154e5f758b797e4fc48c76b0566320 (diff) | |
download | scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.gz scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.bz2 scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.zip |
SWORD25: Mass-astyle.
svn-id: r53222
Diffstat (limited to 'engines/sword25/input/inputengine_script.cpp')
-rw-r--r-- | engines/sword25/input/inputengine_script.cpp | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp index a7bd39481b..70c26e5282 100644 --- a/engines/sword25/input/inputengine_script.cpp +++ b/engines/sword25/input/inputengine_script.cpp @@ -23,7 +23,7 @@ * */ -/* +/* * This code is based on Broken Sword 2.5 engine * * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer @@ -61,45 +61,47 @@ static void TheCharacterCallback(int Character); static void TheCommandCallback(int Command); namespace { - class CharacterCallbackClass : public BS_LuaCallback { - public: - CharacterCallbackClass(lua_State *L) : BS_LuaCallback(L) {}; - - Common::String Character; - - protected: - int PreFunctionInvokation(lua_State *L) { - lua_pushstring(L, Character.c_str()); - return 1; - } - }; - Common::SharedPtr<CharacterCallbackClass> CharacterCallbackPtr; - - // ----------------------------------------------------------------------------- - - class CommandCallbackClass : public BS_LuaCallback { - public: - CommandCallbackClass(lua_State *L) : BS_LuaCallback(L) { Command = BS_InputEngine::KEY_COMMAND_BACKSPACE; } - - BS_InputEngine::KEY_COMMANDS Command; - - protected: - int PreFunctionInvokation(lua_State *L) { - lua_pushnumber(L, Command); - return 1; - } - }; - Common::SharedPtr<CommandCallbackClass> CommandCallbackPtr; - - // ------------------------------------------------------------------------- - - struct CallbackfunctionRegisterer { - CallbackfunctionRegisterer() { - BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaCommandCB", TheCommandCallback); - BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaCharacterCB", TheCharacterCallback); - } - }; - static CallbackfunctionRegisterer Instance; +class CharacterCallbackClass : public BS_LuaCallback { +public: + CharacterCallbackClass(lua_State *L) : BS_LuaCallback(L) {}; + + Common::String Character; + +protected: + int PreFunctionInvokation(lua_State *L) { + lua_pushstring(L, Character.c_str()); + return 1; + } +}; +Common::SharedPtr<CharacterCallbackClass> CharacterCallbackPtr; + +// ----------------------------------------------------------------------------- + +class CommandCallbackClass : public BS_LuaCallback { +public: + CommandCallbackClass(lua_State *L) : BS_LuaCallback(L) { + Command = BS_InputEngine::KEY_COMMAND_BACKSPACE; + } + + BS_InputEngine::KEY_COMMANDS Command; + +protected: + int PreFunctionInvokation(lua_State *L) { + lua_pushnumber(L, Command); + return 1; + } +}; +Common::SharedPtr<CommandCallbackClass> CommandCallbackPtr; + +// ------------------------------------------------------------------------- + +struct CallbackfunctionRegisterer { + CallbackfunctionRegisterer() { + BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaCommandCB", TheCommandCallback); + BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaCharacterCB", TheCharacterCallback); + } +}; +static CallbackfunctionRegisterer Instance; } // ----------------------------------------------------------------------------- @@ -313,7 +315,7 @@ static const luaL_reg PACKAGE_FUNCTIONS[] = { "UnregisterCharacterCallback", UnregisterCharacterCallback, "RegisterCommandCallback", RegisterCommandCallback, "UnregisterCommandCallback", UnregisterCommandCallback, - 0, 0, + 0, 0, }; #define X(k) "KEY_" #k, BS_InputEngine::KEY_##k |