diff options
| author | Eugene Sandulenko | 2010-10-03 13:25:22 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-13 00:08:28 +0000 |
| commit | 54ccc8f4c906cd4f84c955581c0368886a7a9c78 (patch) | |
| tree | 04b7ce0ef984565e4824ad4b73dc32493e65f018 /engines/sword25/kernel | |
| parent | 1e15d8efb73503d9f613cc60023771b0c11f0dd6 (diff) | |
| download | scummvm-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/kernel')
| -rw-r--r-- | engines/sword25/kernel/kernel.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/kernel/kernel_script.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp index a398fdfa38..3e7e7f125f 100644 --- a/engines/sword25/kernel/kernel.cpp +++ b/engines/sword25/kernel/kernel.cpp @@ -86,7 +86,7 @@ Kernel::Kernel() : // Initialise the script engine ScriptEngine *pScript = static_cast<ScriptEngine *>(NewService("script", "lua")); - if (!pScript || !pScript->Init()) { + if (!pScript || !pScript->init()) { _InitSuccess = false; return; } diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 16bb2d0636..1b87dfdc6e 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -174,7 +174,7 @@ static int ExecuteFile(lua_State *L) { ScriptEngine *pSE = static_cast<ScriptEngine *>(pKernel->GetService("script")); BS_ASSERT(pSE); - lua_pushbooleancpp(L, pSE->ExecuteFile(luaL_checkstring(L, 1))); + lua_pushbooleancpp(L, pSE->executeFile(luaL_checkstring(L, 1))); return 0; } @@ -725,13 +725,13 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = { bool Kernel::_RegisterScriptBindings() { ScriptEngine *pScript = static_cast<ScriptEngine *>(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, KERNEL_LIBRARY_NAME, KERNEL_FUNCTIONS)) return false; - if (!LuaBindhelper::AddFunctionsToLib(L, WINDOW_LIBRARY_NAME, WINDOW_FUNCTIONS)) return false; - if (!LuaBindhelper::AddFunctionsToLib(L, RESOURCE_LIBRARY_NAME, RESOURCE_FUNCTIONS)) return false; - if (!LuaBindhelper::AddFunctionsToLib(L, PERSISTENCE_LIBRARY_NAME, PERSISTENCE_FUNCTIONS)) return false; + if (!LuaBindhelper::addFunctionsToLib(L, KERNEL_LIBRARY_NAME, KERNEL_FUNCTIONS)) return false; + if (!LuaBindhelper::addFunctionsToLib(L, WINDOW_LIBRARY_NAME, WINDOW_FUNCTIONS)) return false; + if (!LuaBindhelper::addFunctionsToLib(L, RESOURCE_LIBRARY_NAME, RESOURCE_FUNCTIONS)) return false; + if (!LuaBindhelper::addFunctionsToLib(L, PERSISTENCE_LIBRARY_NAME, PERSISTENCE_FUNCTIONS)) return false; return true; } |