aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/input/inputengine_script.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-10-03 13:25:22 +0000
committerEugene Sandulenko2010-10-13 00:08:28 +0000
commit54ccc8f4c906cd4f84c955581c0368886a7a9c78 (patch)
tree04b7ce0ef984565e4824ad4b73dc32493e65f018 /engines/sword25/input/inputengine_script.cpp
parent1e15d8efb73503d9f613cc60023771b0c11f0dd6 (diff)
downloadscummvm-rg350-54ccc8f4c906cd4f84c955581c0368886a7a9c78.tar.gz
scummvm-rg350-54ccc8f4c906cd4f84c955581c0368886a7a9c78.tar.bz2
scummvm-rg350-54ccc8f4c906cd4f84c955581c0368886a7a9c78.zip
SWORD25: Enforced code naming conventions in script/*
svn-id: r53391
Diffstat (limited to 'engines/sword25/input/inputengine_script.cpp')
-rw-r--r--engines/sword25/input/inputengine_script.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp
index 791414f639..38ecc3cf56 100644
--- a/engines/sword25/input/inputengine_script.cpp
+++ b/engines/sword25/input/inputengine_script.cpp
@@ -245,15 +245,15 @@ static int SetMouseY(lua_State *L) {
static void TheCharacterCallback(int Character) {
CharacterCallbackPtr->Character = static_cast<byte>(Character);
- lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
- CharacterCallbackPtr->InvokeCallbackFunctions(L, 1);
+ lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->getScriptObject());
+ CharacterCallbackPtr->invokeCallbackFunctions(L, 1);
}
// -----------------------------------------------------------------------------
static int RegisterCharacterCallback(lua_State *L) {
luaL_checktype(L, 1, LUA_TFUNCTION);
- CharacterCallbackPtr->RegisterCallbackFunction(L, 1);
+ CharacterCallbackPtr->registerCallbackFunction(L, 1);
return 0;
}
@@ -262,7 +262,7 @@ static int RegisterCharacterCallback(lua_State *L) {
static int UnregisterCharacterCallback(lua_State *L) {
luaL_checktype(L, 1, LUA_TFUNCTION);
- CharacterCallbackPtr->UnregisterCallbackFunction(L, 1);
+ CharacterCallbackPtr->unregisterCallbackFunction(L, 1);
return 0;
}
@@ -271,15 +271,15 @@ static int UnregisterCharacterCallback(lua_State *L) {
static void TheCommandCallback(int Command) {
CommandCallbackPtr->Command = static_cast<InputEngine::KEY_COMMANDS>(Command);
- lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
- CommandCallbackPtr->InvokeCallbackFunctions(L, 1);
+ lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->getScriptObject());
+ CommandCallbackPtr->invokeCallbackFunctions(L, 1);
}
// -----------------------------------------------------------------------------
static int RegisterCommandCallback(lua_State *L) {
luaL_checktype(L, 1, LUA_TFUNCTION);
- CommandCallbackPtr->RegisterCallbackFunction(L, 1);
+ CommandCallbackPtr->registerCallbackFunction(L, 1);
return 0;
}
@@ -288,7 +288,7 @@ static int RegisterCommandCallback(lua_State *L) {
static int UnregisterCommandCallback(lua_State *L) {
luaL_checktype(L, 1, LUA_TFUNCTION);
- CommandCallbackPtr->UnregisterCallbackFunction(L, 1);
+ CommandCallbackPtr->unregisterCallbackFunction(L, 1);
return 0;
}
@@ -340,11 +340,11 @@ bool InputEngine::registerScriptBindings() {
BS_ASSERT(pKernel);
ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script"));
BS_ASSERT(pScript);
- lua_State *L = static_cast<lua_State *>(pScript->GetScriptObject());
+ lua_State *L = static_cast<lua_State *>(pScript->getScriptObject());
BS_ASSERT(L);
- if (!LuaBindhelper::AddFunctionsToLib(L, PACKAGE_LIBRARY_NAME, PACKAGE_FUNCTIONS)) return false;
- if (!LuaBindhelper::AddConstantsToLib(L, PACKAGE_LIBRARY_NAME, PACKAGE_CONSTANTS)) return false;
+ if (!LuaBindhelper::addFunctionsToLib(L, PACKAGE_LIBRARY_NAME, PACKAGE_FUNCTIONS)) return false;
+ if (!LuaBindhelper::addConstantsToLib(L, PACKAGE_LIBRARY_NAME, PACKAGE_CONSTANTS)) return false;
CharacterCallbackPtr = Common::SharedPtr<CharacterCallbackClass>(new CharacterCallbackClass(L));
CommandCallbackPtr = Common::SharedPtr<CommandCallbackClass>(new CommandCallbackClass(L));