From a683a420a9e43705c972b5e74d55e319729e1a81 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 29 Jul 2010 19:53:02 +0000 Subject: SWORD25: Importing original sources svn-id: r53171 --- engines/sword25/kernel/kernel_script.cpp | 775 +++++++++++++++++++++++++++++++ 1 file changed, 775 insertions(+) create mode 100755 engines/sword25/kernel/kernel_script.cpp (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp new file mode 100755 index 0000000000..4436e05e55 --- /dev/null +++ b/engines/sword25/kernel/kernel_script.cpp @@ -0,0 +1,775 @@ +// ----------------------------------------------------------------------------- +// This file is part of Broken Sword 2.5 +// Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdörfer +// +// Broken Sword 2.5 is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Broken Sword 2.5 is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Broken Sword 2.5; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// ----------------------------------------------------------------------------- + +// ----------------------------------------------------------------------------- +// Includes +// ----------------------------------------------------------------------------- + +#include "common.h" +#include "kernel.h" +#include "filesystemutil.h" +#include "window.h" +#include "resmanager.h" +#include "persistenceservice.h" +#include "wincodegenerator.h" +#include "debug/debugtools.h" +#include "script/script.h" +#include "script/luabindhelper.h" + +// ----------------------------------------------------------------------------- + +static int DisconnectService(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushboolean(L, pKernel->DisconnectService(luaL_checkstring(L, 1))); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetActiveServiceIdentifier(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushstring(L, pKernel->GetActiveServiceIdentifier(luaL_checkstring(L,1)).c_str()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetSuperclassCount(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushnumber(L, pKernel->GetSuperclassCount()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetSuperclassIdentifier(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushstring(L, pKernel->GetSuperclassIdentifier(static_cast(luaL_checknumber(L,1))).c_str()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetServiceCount(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushnumber(L, pKernel->GetServiceCount(luaL_checkstring(L, 1))); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetServiceIdentifier(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), static_cast(luaL_checknumber(L, 2))).c_str()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetMilliTicks(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushnumber(L, pKernel->GetMilliTicks()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetTimer(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushnumber(L, static_cast(pKernel->GetMicroTicks()) / 1000000.0); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int StartService(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + + lua_pushbooleancpp(L, pKernel->NewService(luaL_checkstring(L, 1), luaL_checkstring(L, 2)) != NULL); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int Sleep(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + pKernel->Sleep(static_cast(luaL_checknumber(L, 1) * 1000)); + return 0; +} + +// ----------------------------------------------------------------------------- + +static int Crash(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + pKernel->Crash(); + return 0; +} + +// ----------------------------------------------------------------------------- + +static int ExecuteFile(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ScriptEngine * pSE = static_cast(pKernel->GetService("script")); + BS_ASSERT(pSE); + + lua_pushbooleancpp(L, pSE->ExecuteFile(luaL_checkstring(L, 1))); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int GetUserdataDirectory(lua_State * L) +{ + lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetUserdataDirectory().c_str()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetPathSeparator(lua_State * L) +{ + lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetPathSeparator().c_str()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int FileExists(lua_State * L) +{ + lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1))); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int CreateDirectory(lua_State * L) +{ + lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1))); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetWinCode(lua_State * L) +{ + lua_pushstring(L, BS_WinCodeGenerator::GetWinCode().c_str()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetSubversionRevision(lua_State * L) +{ + lua_pushnumber(L, BS_Debugtools::GetSubversionRevision()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetUsedMemory(lua_State * L) +{ + lua_pushnumber(L, BS_Kernel::GetInstance()->GetUsedMemory()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static const char * KERNEL_LIBRARY_NAME = "Kernel"; + +static const luaL_reg KERNEL_FUNCTIONS[] = +{ + "DisconnectService", DisconnectService, + "GetActiveServiceIdentifier", GetActiveServiceIdentifier, + "GetSuperclassCount", GetSuperclassCount, + "GetSuperclassIdentifier", GetSuperclassIdentifier, + "GetServiceCount", GetServiceCount, + "GetServiceIdentifier", GetServiceIdentifier, + "GetMilliTicks", GetMilliTicks, + "GetTimer", GetTimer, + "StartService", StartService, + "Sleep", Sleep, + "Crash", Crash, + "ExecuteFile", ExecuteFile, + "GetUserdataDirectory", GetUserdataDirectory, + "GetPathSeparator", GetPathSeparator, + "FileExists", FileExists, + "CreateDirectory", CreateDirectory, + "GetWinCode", GetWinCode, + "GetSubversionRevision", GetSubversionRevision, + "GetUsedMemory", GetUsedMemory, + 0, 0, +}; + +// ----------------------------------------------------------------------------- + +static int IsVisible(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushbooleancpp(L, pWindow->IsVisible()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int SetVisible(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + pWindow->SetVisible(lua_tobooleancpp(L, 1)); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int GetX(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushnumber(L, pWindow->GetX()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetY(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushnumber(L, pWindow->GetY()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int SetX(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + pWindow->SetX(static_cast(luaL_checknumber(L, 1))); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int SetY(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + pWindow->SetY(static_cast(luaL_checknumber(L, 1))); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int GetClientX(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushnumber(L, pWindow->GetClientX()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetClientY(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushnumber(L, pWindow->GetClientY()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetWidth(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushnumber(L, pWindow->GetWidth()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetHeight(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushnumber(L, pWindow->GetHeight()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int SetWidth(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + pWindow->SetWidth(static_cast(luaL_checknumber(L, 1))); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int SetHeight(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + pWindow->SetHeight(static_cast(luaL_checknumber(L, 1))); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int GetTitle(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushstring(L, pWindow->GetTitle().c_str()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int SetTitle(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + pWindow->SetTitle(luaL_checkstring(L, 1)); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int ProcessMessages(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushbooleancpp(L, pWindow->ProcessMessages()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int CloseWanted(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushbooleancpp(L, pWindow->CloseWanted()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int WaitForFocus(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushbooleancpp(L, pWindow->WaitForFocus()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int HasFocus(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_Window * pWindow = pKernel->GetWindow(); + BS_ASSERT(pWindow); + + lua_pushbooleancpp(L, pWindow->HasFocus()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static const char * WINDOW_LIBRARY_NAME = "Window"; + +static const luaL_reg WINDOW_FUNCTIONS[] = +{ + "IsVisible", IsVisible, + "SetVisible", SetVisible, + "GetX", GetX, + "SetX", SetX, + "GetY", GetY, + "SetY", SetY, + "GetClientX", GetClientX, + "GetClientY", GetClientY, + "GetWidth", GetWidth, + "GetHeight", GetHeight, + "SetWidth", SetWidth, + "SetHeight", SetHeight, + "GetTitle", GetTitle, + "SetTitle", SetTitle, + "ProcessMessages", ProcessMessages, + "CloseWanted", CloseWanted, + "WaitForFocus", WaitForFocus, + "HasFocus", HasFocus, + 0, 0, +}; + +// ----------------------------------------------------------------------------- + +static int PrecacheResource(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1))); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int ForcePrecacheResource(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1), true)); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetMaxMemoryUsage(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + lua_pushnumber(L, pResource->GetMaxMemoryUsage()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int SetMaxMemoryUsage(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + pResource->SetMaxMemoryUsage(static_cast(lua_tonumber(L, 1))); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int EmptyCache(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + pResource->EmptyCache(); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int IsLogCacheMiss(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + lua_pushbooleancpp(L, pResource->IsLogCacheMiss()); + + return 1; +} + +// ----------------------------------------------------------------------------- + +static int SetLogCacheMiss(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + pResource->SetLogCacheMiss(lua_tobooleancpp(L, 1)); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static int DumpLockedResources(lua_State * L) +{ + BS_Kernel * pKernel = BS_Kernel::GetInstance(); + BS_ASSERT(pKernel); + BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ASSERT(pResource); + + pResource->DumpLockedResources(); + + return 0; +} + +// ----------------------------------------------------------------------------- + +static const char * RESOURCE_LIBRARY_NAME = "Resource"; + +static const luaL_reg RESOURCE_FUNCTIONS[] = +{ + "PrecacheResource", PrecacheResource, + "ForcePrecacheResource", ForcePrecacheResource, + "GetMaxMemoryUsage", GetMaxMemoryUsage, + "SetMaxMemoryUsage", SetMaxMemoryUsage, + "EmptyCache", EmptyCache, + "IsLogCacheMiss", IsLogCacheMiss, + "SetLogCacheMiss", SetLogCacheMiss, + "DumpLockedResources", DumpLockedResources, + 0, 0, +}; + +// ----------------------------------------------------------------------------- + +static int ReloadSlots(lua_State * L) +{ + BS_PersistenceService::GetInstance().ReloadSlots(); + lua_pushnil(L); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetSlotCount(lua_State * L) +{ + lua_pushnumber(L, BS_PersistenceService::GetInstance().GetSlotCount()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int IsSlotOccupied(lua_State * L) +{ + lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSlotOccupied(static_cast(luaL_checknumber(L, 1)) - 1)); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetSavegameDirectory(lua_State * L) +{ + lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDirectory().c_str()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int IsSavegameCompatible(lua_State * L) +{ + lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSavegameCompatible(static_cast(luaL_checknumber(L, 1)) - 1)); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetSavegameDescription(lua_State * L) +{ + lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int GetSavegameFilename(lua_State * L) +{ + lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameFilename(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int LoadGame(lua_State * L) +{ + lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().LoadGame(static_cast(luaL_checknumber(L, 1)) - 1)); + return 1; +} + +// ----------------------------------------------------------------------------- + +static int SaveGame(lua_State * L) +{ + lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().SaveGame(static_cast(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2))); + return 1; +} + +// ----------------------------------------------------------------------------- + +static const char * PERSISTENCE_LIBRARY_NAME = "Persistence"; + +static const luaL_reg PERSISTENCE_FUNCTIONS[] = +{ + "ReloadSlots", ReloadSlots, + "GetSlotCount", GetSlotCount, + "IsSlotOccupied", IsSlotOccupied, + "GetSavegameDirectory", GetSavegameDirectory, + "IsSavegameCompatible", IsSavegameCompatible, + "GetSavegameDescription", GetSavegameDescription, + "GetSavegameFilename", GetSavegameFilename, + "LoadGame", LoadGame, + "SaveGame", SaveGame, + 0, 0, +}; + +// ----------------------------------------------------------------------------- + +bool BS_Kernel::_RegisterScriptBindings() +{ + BS_ScriptEngine * pScript = static_cast(GetService("script")); + BS_ASSERT(pScript); + lua_State * L = static_cast(pScript->GetScriptObject()); + BS_ASSERT(L); + + if (!BS_LuaBindhelper::AddFunctionsToLib(L, KERNEL_LIBRARY_NAME, KERNEL_FUNCTIONS)) return false; + if (!BS_LuaBindhelper::AddFunctionsToLib(L, WINDOW_LIBRARY_NAME, WINDOW_FUNCTIONS)) return false; + if (!BS_LuaBindhelper::AddFunctionsToLib(L, RESOURCE_LIBRARY_NAME, RESOURCE_FUNCTIONS)) return false; + if (!BS_LuaBindhelper::AddFunctionsToLib(L, PERSISTENCE_LIBRARY_NAME, PERSISTENCE_FUNCTIONS)) return false; + + return true; +} -- cgit v1.2.3 From e8bca8b8fe0f80e0d5053b190840b034f50ae163 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 30 Jul 2010 09:02:39 +0000 Subject: SWORD25: Fixed rest of the include paths svn-id: r53181 --- engines/sword25/kernel/kernel_script.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 4436e05e55..151cb2786f 100755 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -21,16 +21,16 @@ // Includes // ----------------------------------------------------------------------------- -#include "common.h" -#include "kernel.h" -#include "filesystemutil.h" -#include "window.h" -#include "resmanager.h" -#include "persistenceservice.h" -#include "wincodegenerator.h" -#include "debug/debugtools.h" -#include "script/script.h" -#include "script/luabindhelper.h" +#include "sword25/kernel/common.h" +#include "sword25/kernel/kernel.h" +#include "sword25/kernel/filesystemutil.h" +#include "sword25/kernel/window.h" +#include "sword25/kernel/resmanager.h" +#include "sword25/kernel/persistenceservice.h" +#include "sword25/kernel/wincodegenerator.h" +#include "sword25/debug/debugtools.h" +#include "sword25/script/script.h" +#include "sword25/script/luabindhelper.h" // ----------------------------------------------------------------------------- -- cgit v1.2.3 From 69b618a8f5517c609a5e94d9609dc27aea2ad573 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 30 Jul 2010 12:19:13 +0000 Subject: SWORD25: Compilation fixes Majority of files now compile under Windoze. svn-id: r53182 --- engines/sword25/kernel/kernel_script.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 151cb2786f..c7cfa68a3e 100755 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -28,7 +28,7 @@ #include "sword25/kernel/resmanager.h" #include "sword25/kernel/persistenceservice.h" #include "sword25/kernel/wincodegenerator.h" -#include "sword25/debug/debugtools.h" +#include "sword25/kernel/debug/debugtools.h" #include "sword25/script/script.h" #include "sword25/script/luabindhelper.h" -- cgit v1.2.3 From 293bf95c01f76c8d812a300eb038854f1246ab3d Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 31 Jul 2010 09:53:02 +0000 Subject: SWORD25: Replacing headers with ScummVM ones plus original (C) svn-id: r53188 --- engines/sword25/kernel/kernel_script.cpp | 51 +++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 18 deletions(-) mode change 100755 => 100644 engines/sword25/kernel/kernel_script.cpp (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp old mode 100755 new mode 100644 index c7cfa68a3e..0062e93f83 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -1,21 +1,36 @@ -// ----------------------------------------------------------------------------- -// This file is part of Broken Sword 2.5 -// Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdörfer -// -// Broken Sword 2.5 is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// Broken Sword 2.5 is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Broken Sword 2.5; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// ----------------------------------------------------------------------------- +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +/* + * This code is based on Broken Sword 2.5 engine + * + * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer + * + * Licensed under GNU GPL v2 + * + */ // ----------------------------------------------------------------------------- // Includes -- cgit v1.2.3 From 11b485122c9a64b68fc7073cb2fb3c18b19148b7 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 31 Jul 2010 11:09:10 +0000 Subject: SWORD25: get rid of custom md5.cpp and Windows-specific debug stuff All version ID generation is useless for ScummVM as we have our own clear versions. Thus removing all of that. svn-id: r53191 --- engines/sword25/kernel/kernel_script.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 0062e93f83..22ed32625b 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -225,7 +225,7 @@ static int CreateDirectory(lua_State * L) static int GetWinCode(lua_State * L) { - lua_pushstring(L, BS_WinCodeGenerator::GetWinCode().c_str()); + lua_pushstring(L, "ScummVM"); return 1; } @@ -233,7 +233,8 @@ static int GetWinCode(lua_State * L) static int GetSubversionRevision(lua_State * L) { - lua_pushnumber(L, BS_Debugtools::GetSubversionRevision()); + // ScummVM is 1337 + lua_pushnumber(L, 1337); return 1; } -- cgit v1.2.3 From 6a55700935983efc0d7e9fd37563c14dcc199027 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 31 Jul 2010 11:18:20 +0000 Subject: SWORD25: Removed leftover include references svn-id: r53192 --- engines/sword25/kernel/kernel_script.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 22ed32625b..7dc555a6aa 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -42,8 +42,6 @@ #include "sword25/kernel/window.h" #include "sword25/kernel/resmanager.h" #include "sword25/kernel/persistenceservice.h" -#include "sword25/kernel/wincodegenerator.h" -#include "sword25/kernel/debug/debugtools.h" #include "sword25/script/script.h" #include "sword25/script/luabindhelper.h" -- cgit v1.2.3 From 2d8e94e4ff71cefb9822732741bc7eb1a9116e07 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 1 Aug 2010 01:49:06 +0000 Subject: SWORD25: Converted Lua interface classes svn-id: r53195 --- engines/sword25/kernel/kernel_script.cpp | 326 +++++++++++++------------------ 1 file changed, 138 insertions(+), 188 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 7dc555a6aa..f26a8a4f33 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -45,11 +45,12 @@ #include "sword25/script/script.h" #include "sword25/script/luabindhelper.h" +namespace Sword25 { + // ----------------------------------------------------------------------------- -static int DisconnectService(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int DisconnectService(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushboolean(L, pKernel->DisconnectService(luaL_checkstring(L, 1))); @@ -59,9 +60,8 @@ static int DisconnectService(lua_State * L) // ----------------------------------------------------------------------------- -static int GetActiveServiceIdentifier(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetActiveServiceIdentifier(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushstring(L, pKernel->GetActiveServiceIdentifier(luaL_checkstring(L,1)).c_str()); @@ -71,9 +71,8 @@ static int GetActiveServiceIdentifier(lua_State * L) // ----------------------------------------------------------------------------- -static int GetSuperclassCount(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetSuperclassCount(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, pKernel->GetSuperclassCount()); @@ -83,21 +82,20 @@ static int GetSuperclassCount(lua_State * L) // ----------------------------------------------------------------------------- -static int GetSuperclassIdentifier(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetSuperclassIdentifier(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - lua_pushstring(L, pKernel->GetSuperclassIdentifier(static_cast(luaL_checknumber(L,1))).c_str()); + lua_pushstring(L, pKernel->GetSuperclassIdentifier( + static_cast(luaL_checknumber(L,1))).c_str()); return 1; } // ----------------------------------------------------------------------------- -static int GetServiceCount(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetServiceCount(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, pKernel->GetServiceCount(luaL_checkstring(L, 1))); @@ -107,21 +105,20 @@ static int GetServiceCount(lua_State * L) // ----------------------------------------------------------------------------- -static int GetServiceIdentifier(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetServiceIdentifier(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), static_cast(luaL_checknumber(L, 2))).c_str()); + lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), + static_cast(luaL_checknumber(L, 2))).c_str()); return 1; } // ----------------------------------------------------------------------------- -static int GetMilliTicks(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetMilliTicks(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, pKernel->GetMilliTicks()); @@ -131,9 +128,8 @@ static int GetMilliTicks(lua_State * L) // ----------------------------------------------------------------------------- -static int GetTimer(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetTimer(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, static_cast(pKernel->GetMicroTicks()) / 1000000.0); @@ -143,9 +139,8 @@ static int GetTimer(lua_State * L) // ----------------------------------------------------------------------------- -static int StartService(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int StartService(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushbooleancpp(L, pKernel->NewService(luaL_checkstring(L, 1), luaL_checkstring(L, 2)) != NULL); @@ -155,9 +150,8 @@ static int StartService(lua_State * L) // ----------------------------------------------------------------------------- -static int Sleep(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int Sleep(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); pKernel->Sleep(static_cast(luaL_checknumber(L, 1) * 1000)); return 0; @@ -165,9 +159,8 @@ static int Sleep(lua_State * L) // ----------------------------------------------------------------------------- -static int Crash(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int Crash(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); pKernel->Crash(); return 0; @@ -175,9 +168,8 @@ static int Crash(lua_State * L) // ----------------------------------------------------------------------------- -static int ExecuteFile(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int ExecuteFile(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); BS_ScriptEngine * pSE = static_cast(pKernel->GetService("script")); BS_ASSERT(pSE); @@ -189,48 +181,42 @@ static int ExecuteFile(lua_State * L) // ----------------------------------------------------------------------------- -static int GetUserdataDirectory(lua_State * L) -{ +static int GetUserdataDirectory(lua_State *L) { lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetUserdataDirectory().c_str()); return 1; } // ----------------------------------------------------------------------------- -static int GetPathSeparator(lua_State * L) -{ +static int GetPathSeparator(lua_State *L) { lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetPathSeparator().c_str()); return 1; } // ----------------------------------------------------------------------------- -static int FileExists(lua_State * L) -{ +static int FileExists(lua_State *L) { lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1))); return 1; } // ----------------------------------------------------------------------------- -static int CreateDirectory(lua_State * L) -{ +static int CreateDirectory(lua_State *L) { lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1))); return 1; } // ----------------------------------------------------------------------------- -static int GetWinCode(lua_State * L) -{ +static int GetWinCode(lua_State *L) { lua_pushstring(L, "ScummVM"); return 1; } // ----------------------------------------------------------------------------- -static int GetSubversionRevision(lua_State * L) -{ +static int GetSubversionRevision(lua_State *L) { // ScummVM is 1337 lua_pushnumber(L, 1337); return 1; @@ -238,8 +224,7 @@ static int GetSubversionRevision(lua_State * L) // ----------------------------------------------------------------------------- -static int GetUsedMemory(lua_State * L) -{ +static int GetUsedMemory(lua_State *L) { lua_pushnumber(L, BS_Kernel::GetInstance()->GetUsedMemory()); return 1; } @@ -248,8 +233,7 @@ static int GetUsedMemory(lua_State * L) static const char * KERNEL_LIBRARY_NAME = "Kernel"; -static const luaL_reg KERNEL_FUNCTIONS[] = -{ +static const luaL_reg KERNEL_FUNCTIONS[] = { "DisconnectService", DisconnectService, "GetActiveServiceIdentifier", GetActiveServiceIdentifier, "GetSuperclassCount", GetSuperclassCount, @@ -274,11 +258,10 @@ static const luaL_reg KERNEL_FUNCTIONS[] = // ----------------------------------------------------------------------------- -static int IsVisible(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int IsVisible(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->IsVisible()); @@ -288,11 +271,10 @@ static int IsVisible(lua_State * L) // ----------------------------------------------------------------------------- -static int SetVisible(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetVisible(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetVisible(lua_tobooleancpp(L, 1)); @@ -302,11 +284,10 @@ static int SetVisible(lua_State * L) // ----------------------------------------------------------------------------- -static int GetX(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetX(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetX()); @@ -316,11 +297,10 @@ static int GetX(lua_State * L) // ----------------------------------------------------------------------------- -static int GetY(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetY(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetY()); @@ -330,11 +310,10 @@ static int GetY(lua_State * L) // ----------------------------------------------------------------------------- -static int SetX(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetX(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetX(static_cast(luaL_checknumber(L, 1))); @@ -344,11 +323,10 @@ static int SetX(lua_State * L) // ----------------------------------------------------------------------------- -static int SetY(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetY(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetY(static_cast(luaL_checknumber(L, 1))); @@ -358,11 +336,10 @@ static int SetY(lua_State * L) // ----------------------------------------------------------------------------- -static int GetClientX(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetClientX(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetClientX()); @@ -372,11 +349,10 @@ static int GetClientX(lua_State * L) // ----------------------------------------------------------------------------- -static int GetClientY(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetClientY(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetClientY()); @@ -386,11 +362,10 @@ static int GetClientY(lua_State * L) // ----------------------------------------------------------------------------- -static int GetWidth(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetWidth(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetWidth()); @@ -400,11 +375,10 @@ static int GetWidth(lua_State * L) // ----------------------------------------------------------------------------- -static int GetHeight(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetHeight(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetHeight()); @@ -414,11 +388,10 @@ static int GetHeight(lua_State * L) // ----------------------------------------------------------------------------- -static int SetWidth(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetWidth(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetWidth(static_cast(luaL_checknumber(L, 1))); @@ -428,11 +401,10 @@ static int SetWidth(lua_State * L) // ----------------------------------------------------------------------------- -static int SetHeight(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetHeight(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetHeight(static_cast(luaL_checknumber(L, 1))); @@ -442,11 +414,10 @@ static int SetHeight(lua_State * L) // ----------------------------------------------------------------------------- -static int GetTitle(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetTitle(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushstring(L, pWindow->GetTitle().c_str()); @@ -456,11 +427,10 @@ static int GetTitle(lua_State * L) // ----------------------------------------------------------------------------- -static int SetTitle(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetTitle(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetTitle(luaL_checkstring(L, 1)); @@ -470,11 +440,10 @@ static int SetTitle(lua_State * L) // ----------------------------------------------------------------------------- -static int ProcessMessages(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int ProcessMessages(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->ProcessMessages()); @@ -484,11 +453,10 @@ static int ProcessMessages(lua_State * L) // ----------------------------------------------------------------------------- -static int CloseWanted(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int CloseWanted(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->CloseWanted()); @@ -498,11 +466,10 @@ static int CloseWanted(lua_State * L) // ----------------------------------------------------------------------------- -static int WaitForFocus(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int WaitForFocus(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->WaitForFocus()); @@ -512,11 +479,10 @@ static int WaitForFocus(lua_State * L) // ----------------------------------------------------------------------------- -static int HasFocus(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int HasFocus(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window * pWindow = pKernel->GetWindow(); + BS_Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->HasFocus()); @@ -528,8 +494,7 @@ static int HasFocus(lua_State * L) static const char * WINDOW_LIBRARY_NAME = "Window"; -static const luaL_reg WINDOW_FUNCTIONS[] = -{ +static const luaL_reg WINDOW_FUNCTIONS[] = { "IsVisible", IsVisible, "SetVisible", SetVisible, "GetX", GetX, @@ -553,11 +518,10 @@ static const luaL_reg WINDOW_FUNCTIONS[] = // ----------------------------------------------------------------------------- -static int PrecacheResource(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int PrecacheResource(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1))); @@ -567,11 +531,10 @@ static int PrecacheResource(lua_State * L) // ----------------------------------------------------------------------------- -static int ForcePrecacheResource(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int ForcePrecacheResource(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1), true)); @@ -581,11 +544,10 @@ static int ForcePrecacheResource(lua_State * L) // ----------------------------------------------------------------------------- -static int GetMaxMemoryUsage(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int GetMaxMemoryUsage(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushnumber(L, pResource->GetMaxMemoryUsage()); @@ -595,11 +557,10 @@ static int GetMaxMemoryUsage(lua_State * L) // ----------------------------------------------------------------------------- -static int SetMaxMemoryUsage(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetMaxMemoryUsage(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->SetMaxMemoryUsage(static_cast(lua_tonumber(L, 1))); @@ -609,11 +570,10 @@ static int SetMaxMemoryUsage(lua_State * L) // ----------------------------------------------------------------------------- -static int EmptyCache(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int EmptyCache(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->EmptyCache(); @@ -623,11 +583,10 @@ static int EmptyCache(lua_State * L) // ----------------------------------------------------------------------------- -static int IsLogCacheMiss(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int IsLogCacheMiss(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushbooleancpp(L, pResource->IsLogCacheMiss()); @@ -637,11 +596,10 @@ static int IsLogCacheMiss(lua_State * L) // ----------------------------------------------------------------------------- -static int SetLogCacheMiss(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int SetLogCacheMiss(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->SetLogCacheMiss(lua_tobooleancpp(L, 1)); @@ -651,11 +609,10 @@ static int SetLogCacheMiss(lua_State * L) // ----------------------------------------------------------------------------- -static int DumpLockedResources(lua_State * L) -{ - BS_Kernel * pKernel = BS_Kernel::GetInstance(); +static int DumpLockedResources(lua_State *L) { + BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager * pResource = pKernel->GetResourceManager(); + BS_ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->DumpLockedResources(); @@ -667,8 +624,7 @@ static int DumpLockedResources(lua_State * L) static const char * RESOURCE_LIBRARY_NAME = "Resource"; -static const luaL_reg RESOURCE_FUNCTIONS[] = -{ +static const luaL_reg RESOURCE_FUNCTIONS[] = { "PrecacheResource", PrecacheResource, "ForcePrecacheResource", ForcePrecacheResource, "GetMaxMemoryUsage", GetMaxMemoryUsage, @@ -682,8 +638,7 @@ static const luaL_reg RESOURCE_FUNCTIONS[] = // ----------------------------------------------------------------------------- -static int ReloadSlots(lua_State * L) -{ +static int ReloadSlots(lua_State *L) { BS_PersistenceService::GetInstance().ReloadSlots(); lua_pushnil(L); return 1; @@ -691,64 +646,59 @@ static int ReloadSlots(lua_State * L) // ----------------------------------------------------------------------------- -static int GetSlotCount(lua_State * L) -{ +static int GetSlotCount(lua_State *L) { lua_pushnumber(L, BS_PersistenceService::GetInstance().GetSlotCount()); return 1; } // ----------------------------------------------------------------------------- -static int IsSlotOccupied(lua_State * L) -{ - lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSlotOccupied(static_cast(luaL_checknumber(L, 1)) - 1)); +static int IsSlotOccupied(lua_State *L) { + lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSlotOccupied( + static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } // ----------------------------------------------------------------------------- -static int GetSavegameDirectory(lua_State * L) -{ +static int GetSavegameDirectory(lua_State *L) { lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDirectory().c_str()); return 1; } // ----------------------------------------------------------------------------- -static int IsSavegameCompatible(lua_State * L) -{ - lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSavegameCompatible(static_cast(luaL_checknumber(L, 1)) - 1)); +static int IsSavegameCompatible(lua_State *L) { + lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSavegameCompatible( + static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } // ----------------------------------------------------------------------------- -static int GetSavegameDescription(lua_State * L) -{ - lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); +static int GetSavegameDescription(lua_State *L) { + lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription( + static_cast(luaL_checknumber(L, 1)) - 1).c_str()); return 1; } // ----------------------------------------------------------------------------- -static int GetSavegameFilename(lua_State * L) -{ +static int GetSavegameFilename(lua_State *L) { lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameFilename(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); return 1; } // ----------------------------------------------------------------------------- -static int LoadGame(lua_State * L) -{ +static int LoadGame(lua_State *L) { lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().LoadGame(static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } // ----------------------------------------------------------------------------- -static int SaveGame(lua_State * L) -{ +static int SaveGame(lua_State *L) { lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().SaveGame(static_cast(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2))); return 1; } @@ -757,8 +707,7 @@ static int SaveGame(lua_State * L) static const char * PERSISTENCE_LIBRARY_NAME = "Persistence"; -static const luaL_reg PERSISTENCE_FUNCTIONS[] = -{ +static const luaL_reg PERSISTENCE_FUNCTIONS[] = { "ReloadSlots", ReloadSlots, "GetSlotCount", GetSlotCount, "IsSlotOccupied", IsSlotOccupied, @@ -773,11 +722,10 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = // ----------------------------------------------------------------------------- -bool BS_Kernel::_RegisterScriptBindings() -{ +bool BS_Kernel::_RegisterScriptBindings() { BS_ScriptEngine * pScript = static_cast(GetService("script")); BS_ASSERT(pScript); - lua_State * L = static_cast(pScript->GetScriptObject()); + lua_State *L = static_cast(pScript->GetScriptObject()); BS_ASSERT(L); if (!BS_LuaBindhelper::AddFunctionsToLib(L, KERNEL_LIBRARY_NAME, KERNEL_FUNCTIONS)) return false; @@ -787,3 +735,5 @@ bool BS_Kernel::_RegisterScriptBindings() return true; } + +} // End of namespace Sword25 -- cgit v1.2.3 From 47904bc7b2992189bb554833f00a79ff0fea9fb8 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 6 Aug 2010 13:13:25 +0000 Subject: SWORD25: Mass-astyle. svn-id: r53222 --- engines/sword25/kernel/kernel_script.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index f26a8a4f33..11caaf9d79 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_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 @@ -64,7 +64,7 @@ static int GetActiveServiceIdentifier(lua_State *L) { BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - lua_pushstring(L, pKernel->GetActiveServiceIdentifier(luaL_checkstring(L,1)).c_str()); + lua_pushstring(L, pKernel->GetActiveServiceIdentifier(luaL_checkstring(L, 1)).c_str()); return 1; } @@ -87,7 +87,7 @@ static int GetSuperclassIdentifier(lua_State *L) { BS_ASSERT(pKernel); lua_pushstring(L, pKernel->GetSuperclassIdentifier( - static_cast(luaL_checknumber(L,1))).c_str()); + static_cast(luaL_checknumber(L, 1))).c_str()); return 1; } @@ -109,8 +109,8 @@ static int GetServiceIdentifier(lua_State *L) { BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), - static_cast(luaL_checknumber(L, 2))).c_str()); + lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), + static_cast(luaL_checknumber(L, 2))).c_str()); return 1; } @@ -171,7 +171,7 @@ static int Crash(lua_State *L) { static int ExecuteFile(lua_State *L) { BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ScriptEngine * pSE = static_cast(pKernel->GetService("script")); + BS_ScriptEngine *pSE = static_cast(pKernel->GetService("script")); BS_ASSERT(pSE); lua_pushbooleancpp(L, pSE->ExecuteFile(luaL_checkstring(L, 1))); @@ -231,7 +231,7 @@ static int GetUsedMemory(lua_State *L) { // ----------------------------------------------------------------------------- -static const char * KERNEL_LIBRARY_NAME = "Kernel"; +static const char *KERNEL_LIBRARY_NAME = "Kernel"; static const luaL_reg KERNEL_FUNCTIONS[] = { "DisconnectService", DisconnectService, @@ -492,7 +492,7 @@ static int HasFocus(lua_State *L) { // ----------------------------------------------------------------------------- -static const char * WINDOW_LIBRARY_NAME = "Window"; +static const char *WINDOW_LIBRARY_NAME = "Window"; static const luaL_reg WINDOW_FUNCTIONS[] = { "IsVisible", IsVisible, @@ -622,7 +622,7 @@ static int DumpLockedResources(lua_State *L) { // ----------------------------------------------------------------------------- -static const char * RESOURCE_LIBRARY_NAME = "Resource"; +static const char *RESOURCE_LIBRARY_NAME = "Resource"; static const luaL_reg RESOURCE_FUNCTIONS[] = { "PrecacheResource", PrecacheResource, @@ -655,7 +655,7 @@ static int GetSlotCount(lua_State *L) { static int IsSlotOccupied(lua_State *L) { lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSlotOccupied( - static_cast(luaL_checknumber(L, 1)) - 1)); + static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } @@ -670,7 +670,7 @@ static int GetSavegameDirectory(lua_State *L) { static int IsSavegameCompatible(lua_State *L) { lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSavegameCompatible( - static_cast(luaL_checknumber(L, 1)) - 1)); + static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } @@ -678,7 +678,7 @@ static int IsSavegameCompatible(lua_State *L) { static int GetSavegameDescription(lua_State *L) { lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription( - static_cast(luaL_checknumber(L, 1)) - 1).c_str()); + static_cast(luaL_checknumber(L, 1)) - 1).c_str()); return 1; } @@ -705,7 +705,7 @@ static int SaveGame(lua_State *L) { // ----------------------------------------------------------------------------- -static const char * PERSISTENCE_LIBRARY_NAME = "Persistence"; +static const char *PERSISTENCE_LIBRARY_NAME = "Persistence"; static const luaL_reg PERSISTENCE_FUNCTIONS[] = { "ReloadSlots", ReloadSlots, @@ -723,7 +723,7 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = { // ----------------------------------------------------------------------------- bool BS_Kernel::_RegisterScriptBindings() { - BS_ScriptEngine * pScript = static_cast(GetService("script")); + BS_ScriptEngine *pScript = static_cast(GetService("script")); BS_ASSERT(pScript); lua_State *L = static_cast(pScript->GetScriptObject()); BS_ASSERT(L); -- cgit v1.2.3 From ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 10 Aug 2010 12:16:31 +0000 Subject: SWORD25: Clean compile! Under MinGW, with OpenGL and tinyxml. svn-id: r53225 --- engines/sword25/kernel/kernel_script.cpp | 116 +++++++++++++++---------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 11caaf9d79..9d62694ad3 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -234,26 +234,26 @@ static int GetUsedMemory(lua_State *L) { static const char *KERNEL_LIBRARY_NAME = "Kernel"; static const luaL_reg KERNEL_FUNCTIONS[] = { - "DisconnectService", DisconnectService, - "GetActiveServiceIdentifier", GetActiveServiceIdentifier, - "GetSuperclassCount", GetSuperclassCount, - "GetSuperclassIdentifier", GetSuperclassIdentifier, - "GetServiceCount", GetServiceCount, - "GetServiceIdentifier", GetServiceIdentifier, - "GetMilliTicks", GetMilliTicks, - "GetTimer", GetTimer, - "StartService", StartService, - "Sleep", Sleep, - "Crash", Crash, - "ExecuteFile", ExecuteFile, - "GetUserdataDirectory", GetUserdataDirectory, - "GetPathSeparator", GetPathSeparator, - "FileExists", FileExists, - "CreateDirectory", CreateDirectory, - "GetWinCode", GetWinCode, - "GetSubversionRevision", GetSubversionRevision, - "GetUsedMemory", GetUsedMemory, - 0, 0, + {"DisconnectService", DisconnectService}, + {"GetActiveServiceIdentifier", GetActiveServiceIdentifier}, + {"GetSuperclassCount", GetSuperclassCount}, + {"GetSuperclassIdentifier", GetSuperclassIdentifier}, + {"GetServiceCount", GetServiceCount}, + {"GetServiceIdentifier", GetServiceIdentifier}, + {"GetMilliTicks", GetMilliTicks}, + {"GetTimer", GetTimer}, + {"StartService", StartService}, + {"Sleep", Sleep}, + {"Crash", Crash}, + {"ExecuteFile", ExecuteFile}, + {"GetUserdataDirectory", GetUserdataDirectory}, + {"GetPathSeparator", GetPathSeparator}, + {"FileExists", FileExists}, + {"CreateDirectory", CreateDirectory}, + {"GetWinCode", GetWinCode}, + {"GetSubversionRevision", GetSubversionRevision}, + {"GetUsedMemory", GetUsedMemory}, + {0, 0} }; // ----------------------------------------------------------------------------- @@ -495,25 +495,25 @@ static int HasFocus(lua_State *L) { static const char *WINDOW_LIBRARY_NAME = "Window"; static const luaL_reg WINDOW_FUNCTIONS[] = { - "IsVisible", IsVisible, - "SetVisible", SetVisible, - "GetX", GetX, - "SetX", SetX, - "GetY", GetY, - "SetY", SetY, - "GetClientX", GetClientX, - "GetClientY", GetClientY, - "GetWidth", GetWidth, - "GetHeight", GetHeight, - "SetWidth", SetWidth, - "SetHeight", SetHeight, - "GetTitle", GetTitle, - "SetTitle", SetTitle, - "ProcessMessages", ProcessMessages, - "CloseWanted", CloseWanted, - "WaitForFocus", WaitForFocus, - "HasFocus", HasFocus, - 0, 0, + {"IsVisible", IsVisible}, + {"SetVisible", SetVisible}, + {"GetX", GetX}, + {"SetX", SetX}, + {"GetY", GetY}, + {"SetY", SetY}, + {"GetClientX", GetClientX}, + {"GetClientY", GetClientY}, + {"GetWidth", GetWidth}, + {"GetHeight", GetHeight}, + {"SetWidth", SetWidth}, + {"SetHeight", SetHeight}, + {"GetTitle", GetTitle}, + {"SetTitle", SetTitle}, + {"ProcessMessages", ProcessMessages}, + {"CloseWanted", CloseWanted}, + {"WaitForFocus", WaitForFocus}, + {"HasFocus", HasFocus}, + {0, 0} }; // ----------------------------------------------------------------------------- @@ -625,15 +625,15 @@ static int DumpLockedResources(lua_State *L) { static const char *RESOURCE_LIBRARY_NAME = "Resource"; static const luaL_reg RESOURCE_FUNCTIONS[] = { - "PrecacheResource", PrecacheResource, - "ForcePrecacheResource", ForcePrecacheResource, - "GetMaxMemoryUsage", GetMaxMemoryUsage, - "SetMaxMemoryUsage", SetMaxMemoryUsage, - "EmptyCache", EmptyCache, - "IsLogCacheMiss", IsLogCacheMiss, - "SetLogCacheMiss", SetLogCacheMiss, - "DumpLockedResources", DumpLockedResources, - 0, 0, + {"PrecacheResource", PrecacheResource}, + {"ForcePrecacheResource", ForcePrecacheResource}, + {"GetMaxMemoryUsage", GetMaxMemoryUsage}, + {"SetMaxMemoryUsage", SetMaxMemoryUsage}, + {"EmptyCache", EmptyCache}, + {"IsLogCacheMiss", IsLogCacheMiss}, + {"SetLogCacheMiss", SetLogCacheMiss}, + {"DumpLockedResources", DumpLockedResources}, + {0, 0} }; // ----------------------------------------------------------------------------- @@ -708,16 +708,16 @@ static int SaveGame(lua_State *L) { static const char *PERSISTENCE_LIBRARY_NAME = "Persistence"; static const luaL_reg PERSISTENCE_FUNCTIONS[] = { - "ReloadSlots", ReloadSlots, - "GetSlotCount", GetSlotCount, - "IsSlotOccupied", IsSlotOccupied, - "GetSavegameDirectory", GetSavegameDirectory, - "IsSavegameCompatible", IsSavegameCompatible, - "GetSavegameDescription", GetSavegameDescription, - "GetSavegameFilename", GetSavegameFilename, - "LoadGame", LoadGame, - "SaveGame", SaveGame, - 0, 0, + {"ReloadSlots", ReloadSlots}, + {"GetSlotCount", GetSlotCount}, + {"IsSlotOccupied", IsSlotOccupied}, + {"GetSavegameDirectory", GetSavegameDirectory}, + {"IsSavegameCompatible", IsSavegameCompatible}, + {"GetSavegameDescription", GetSavegameDescription}, + {"GetSavegameFilename", GetSavegameFilename}, + {"LoadGame", LoadGame}, + {"SaveGame", SaveGame}, + {0, 0} }; // ----------------------------------------------------------------------------- -- cgit v1.2.3 From be44216e5c1d74879d7843215ce1cd3f488b4db8 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 18 Aug 2010 12:57:47 +0000 Subject: SWORD25: eliminated BS_ prefix in all but kernel/ svn-id: r53259 --- engines/sword25/kernel/kernel_script.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 9d62694ad3..9ae78d1e95 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -171,7 +171,7 @@ static int Crash(lua_State *L) { static int ExecuteFile(lua_State *L) { BS_Kernel *pKernel = BS_Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ScriptEngine *pSE = static_cast(pKernel->GetService("script")); + ScriptEngine *pSE = static_cast(pKernel->GetService("script")); BS_ASSERT(pSE); lua_pushbooleancpp(L, pSE->ExecuteFile(luaL_checkstring(L, 1))); @@ -723,15 +723,15 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = { // ----------------------------------------------------------------------------- bool BS_Kernel::_RegisterScriptBindings() { - BS_ScriptEngine *pScript = static_cast(GetService("script")); + ScriptEngine *pScript = static_cast(GetService("script")); BS_ASSERT(pScript); lua_State *L = static_cast(pScript->GetScriptObject()); BS_ASSERT(L); - if (!BS_LuaBindhelper::AddFunctionsToLib(L, KERNEL_LIBRARY_NAME, KERNEL_FUNCTIONS)) return false; - if (!BS_LuaBindhelper::AddFunctionsToLib(L, WINDOW_LIBRARY_NAME, WINDOW_FUNCTIONS)) return false; - if (!BS_LuaBindhelper::AddFunctionsToLib(L, RESOURCE_LIBRARY_NAME, RESOURCE_FUNCTIONS)) return false; - if (!BS_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; } -- cgit v1.2.3 From b01994a53bbc96da907a4c28934e644184291017 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 18 Aug 2010 12:58:22 +0000 Subject: SWORD25: removed BS_ prefix from rest of the classes. The things which are intentionally left with the prefix: BS_LOG, BS_ASSERT, BS_Rect, BS_String. svn-id: r53261 --- engines/sword25/kernel/kernel_script.cpp | 158 +++++++++++++++---------------- 1 file changed, 79 insertions(+), 79 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index 9ae78d1e95..f1c75bd691 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -50,7 +50,7 @@ namespace Sword25 { // ----------------------------------------------------------------------------- static int DisconnectService(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushboolean(L, pKernel->DisconnectService(luaL_checkstring(L, 1))); @@ -61,7 +61,7 @@ static int DisconnectService(lua_State *L) { // ----------------------------------------------------------------------------- static int GetActiveServiceIdentifier(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushstring(L, pKernel->GetActiveServiceIdentifier(luaL_checkstring(L, 1)).c_str()); @@ -72,7 +72,7 @@ static int GetActiveServiceIdentifier(lua_State *L) { // ----------------------------------------------------------------------------- static int GetSuperclassCount(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, pKernel->GetSuperclassCount()); @@ -83,7 +83,7 @@ static int GetSuperclassCount(lua_State *L) { // ----------------------------------------------------------------------------- static int GetSuperclassIdentifier(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushstring(L, pKernel->GetSuperclassIdentifier( @@ -95,7 +95,7 @@ static int GetSuperclassIdentifier(lua_State *L) { // ----------------------------------------------------------------------------- static int GetServiceCount(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, pKernel->GetServiceCount(luaL_checkstring(L, 1))); @@ -106,7 +106,7 @@ static int GetServiceCount(lua_State *L) { // ----------------------------------------------------------------------------- static int GetServiceIdentifier(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), @@ -118,7 +118,7 @@ static int GetServiceIdentifier(lua_State *L) { // ----------------------------------------------------------------------------- static int GetMilliTicks(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, pKernel->GetMilliTicks()); @@ -129,7 +129,7 @@ static int GetMilliTicks(lua_State *L) { // ----------------------------------------------------------------------------- static int GetTimer(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushnumber(L, static_cast(pKernel->GetMicroTicks()) / 1000000.0); @@ -140,7 +140,7 @@ static int GetTimer(lua_State *L) { // ----------------------------------------------------------------------------- static int StartService(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); lua_pushbooleancpp(L, pKernel->NewService(luaL_checkstring(L, 1), luaL_checkstring(L, 2)) != NULL); @@ -151,7 +151,7 @@ static int StartService(lua_State *L) { // ----------------------------------------------------------------------------- static int Sleep(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); pKernel->Sleep(static_cast(luaL_checknumber(L, 1) * 1000)); return 0; @@ -160,7 +160,7 @@ static int Sleep(lua_State *L) { // ----------------------------------------------------------------------------- static int Crash(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); pKernel->Crash(); return 0; @@ -169,7 +169,7 @@ static int Crash(lua_State *L) { // ----------------------------------------------------------------------------- static int ExecuteFile(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); ScriptEngine *pSE = static_cast(pKernel->GetService("script")); BS_ASSERT(pSE); @@ -182,28 +182,28 @@ static int ExecuteFile(lua_State *L) { // ----------------------------------------------------------------------------- static int GetUserdataDirectory(lua_State *L) { - lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetUserdataDirectory().c_str()); + lua_pushstring(L, FileSystemUtil::GetInstance().GetUserdataDirectory().c_str()); return 1; } // ----------------------------------------------------------------------------- static int GetPathSeparator(lua_State *L) { - lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetPathSeparator().c_str()); + lua_pushstring(L, FileSystemUtil::GetInstance().GetPathSeparator().c_str()); return 1; } // ----------------------------------------------------------------------------- static int FileExists(lua_State *L) { - lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1))); + lua_pushbooleancpp(L, FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1))); return 1; } // ----------------------------------------------------------------------------- static int CreateDirectory(lua_State *L) { - lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1))); + lua_pushbooleancpp(L, FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1))); return 1; } @@ -225,7 +225,7 @@ static int GetSubversionRevision(lua_State *L) { // ----------------------------------------------------------------------------- static int GetUsedMemory(lua_State *L) { - lua_pushnumber(L, BS_Kernel::GetInstance()->GetUsedMemory()); + lua_pushnumber(L, Kernel::GetInstance()->GetUsedMemory()); return 1; } @@ -259,9 +259,9 @@ static const luaL_reg KERNEL_FUNCTIONS[] = { // ----------------------------------------------------------------------------- static int IsVisible(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->IsVisible()); @@ -272,9 +272,9 @@ static int IsVisible(lua_State *L) { // ----------------------------------------------------------------------------- static int SetVisible(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetVisible(lua_tobooleancpp(L, 1)); @@ -285,9 +285,9 @@ static int SetVisible(lua_State *L) { // ----------------------------------------------------------------------------- static int GetX(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetX()); @@ -298,9 +298,9 @@ static int GetX(lua_State *L) { // ----------------------------------------------------------------------------- static int GetY(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetY()); @@ -311,9 +311,9 @@ static int GetY(lua_State *L) { // ----------------------------------------------------------------------------- static int SetX(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetX(static_cast(luaL_checknumber(L, 1))); @@ -324,9 +324,9 @@ static int SetX(lua_State *L) { // ----------------------------------------------------------------------------- static int SetY(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetY(static_cast(luaL_checknumber(L, 1))); @@ -337,9 +337,9 @@ static int SetY(lua_State *L) { // ----------------------------------------------------------------------------- static int GetClientX(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetClientX()); @@ -350,9 +350,9 @@ static int GetClientX(lua_State *L) { // ----------------------------------------------------------------------------- static int GetClientY(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetClientY()); @@ -363,9 +363,9 @@ static int GetClientY(lua_State *L) { // ----------------------------------------------------------------------------- static int GetWidth(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetWidth()); @@ -376,9 +376,9 @@ static int GetWidth(lua_State *L) { // ----------------------------------------------------------------------------- static int GetHeight(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushnumber(L, pWindow->GetHeight()); @@ -389,9 +389,9 @@ static int GetHeight(lua_State *L) { // ----------------------------------------------------------------------------- static int SetWidth(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetWidth(static_cast(luaL_checknumber(L, 1))); @@ -402,9 +402,9 @@ static int SetWidth(lua_State *L) { // ----------------------------------------------------------------------------- static int SetHeight(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetHeight(static_cast(luaL_checknumber(L, 1))); @@ -415,9 +415,9 @@ static int SetHeight(lua_State *L) { // ----------------------------------------------------------------------------- static int GetTitle(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushstring(L, pWindow->GetTitle().c_str()); @@ -428,9 +428,9 @@ static int GetTitle(lua_State *L) { // ----------------------------------------------------------------------------- static int SetTitle(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); pWindow->SetTitle(luaL_checkstring(L, 1)); @@ -441,9 +441,9 @@ static int SetTitle(lua_State *L) { // ----------------------------------------------------------------------------- static int ProcessMessages(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->ProcessMessages()); @@ -454,9 +454,9 @@ static int ProcessMessages(lua_State *L) { // ----------------------------------------------------------------------------- static int CloseWanted(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->CloseWanted()); @@ -467,9 +467,9 @@ static int CloseWanted(lua_State *L) { // ----------------------------------------------------------------------------- static int WaitForFocus(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->WaitForFocus()); @@ -480,9 +480,9 @@ static int WaitForFocus(lua_State *L) { // ----------------------------------------------------------------------------- static int HasFocus(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_Window *pWindow = pKernel->GetWindow(); + Window *pWindow = pKernel->GetWindow(); BS_ASSERT(pWindow); lua_pushbooleancpp(L, pWindow->HasFocus()); @@ -519,9 +519,9 @@ static const luaL_reg WINDOW_FUNCTIONS[] = { // ----------------------------------------------------------------------------- static int PrecacheResource(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1))); @@ -532,9 +532,9 @@ static int PrecacheResource(lua_State *L) { // ----------------------------------------------------------------------------- static int ForcePrecacheResource(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1), true)); @@ -545,9 +545,9 @@ static int ForcePrecacheResource(lua_State *L) { // ----------------------------------------------------------------------------- static int GetMaxMemoryUsage(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushnumber(L, pResource->GetMaxMemoryUsage()); @@ -558,9 +558,9 @@ static int GetMaxMemoryUsage(lua_State *L) { // ----------------------------------------------------------------------------- static int SetMaxMemoryUsage(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->SetMaxMemoryUsage(static_cast(lua_tonumber(L, 1))); @@ -571,9 +571,9 @@ static int SetMaxMemoryUsage(lua_State *L) { // ----------------------------------------------------------------------------- static int EmptyCache(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->EmptyCache(); @@ -584,9 +584,9 @@ static int EmptyCache(lua_State *L) { // ----------------------------------------------------------------------------- static int IsLogCacheMiss(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); lua_pushbooleancpp(L, pResource->IsLogCacheMiss()); @@ -597,9 +597,9 @@ static int IsLogCacheMiss(lua_State *L) { // ----------------------------------------------------------------------------- static int SetLogCacheMiss(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->SetLogCacheMiss(lua_tobooleancpp(L, 1)); @@ -610,9 +610,9 @@ static int SetLogCacheMiss(lua_State *L) { // ----------------------------------------------------------------------------- static int DumpLockedResources(lua_State *L) { - BS_Kernel *pKernel = BS_Kernel::GetInstance(); + Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - BS_ResourceManager *pResource = pKernel->GetResourceManager(); + ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); pResource->DumpLockedResources(); @@ -639,7 +639,7 @@ static const luaL_reg RESOURCE_FUNCTIONS[] = { // ----------------------------------------------------------------------------- static int ReloadSlots(lua_State *L) { - BS_PersistenceService::GetInstance().ReloadSlots(); + PersistenceService::GetInstance().ReloadSlots(); lua_pushnil(L); return 1; } @@ -647,14 +647,14 @@ static int ReloadSlots(lua_State *L) { // ----------------------------------------------------------------------------- static int GetSlotCount(lua_State *L) { - lua_pushnumber(L, BS_PersistenceService::GetInstance().GetSlotCount()); + lua_pushnumber(L, PersistenceService::GetInstance().GetSlotCount()); return 1; } // ----------------------------------------------------------------------------- static int IsSlotOccupied(lua_State *L) { - lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSlotOccupied( + lua_pushbooleancpp(L, PersistenceService::GetInstance().IsSlotOccupied( static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } @@ -662,14 +662,14 @@ static int IsSlotOccupied(lua_State *L) { // ----------------------------------------------------------------------------- static int GetSavegameDirectory(lua_State *L) { - lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDirectory().c_str()); + lua_pushstring(L, PersistenceService::GetInstance().GetSavegameDirectory().c_str()); return 1; } // ----------------------------------------------------------------------------- static int IsSavegameCompatible(lua_State *L) { - lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSavegameCompatible( + lua_pushbooleancpp(L, PersistenceService::GetInstance().IsSavegameCompatible( static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } @@ -677,7 +677,7 @@ static int IsSavegameCompatible(lua_State *L) { // ----------------------------------------------------------------------------- static int GetSavegameDescription(lua_State *L) { - lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription( + lua_pushstring(L, PersistenceService::GetInstance().GetSavegameDescription( static_cast(luaL_checknumber(L, 1)) - 1).c_str()); return 1; } @@ -685,21 +685,21 @@ static int GetSavegameDescription(lua_State *L) { // ----------------------------------------------------------------------------- static int GetSavegameFilename(lua_State *L) { - lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameFilename(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); + lua_pushstring(L, PersistenceService::GetInstance().GetSavegameFilename(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); return 1; } // ----------------------------------------------------------------------------- static int LoadGame(lua_State *L) { - lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().LoadGame(static_cast(luaL_checknumber(L, 1)) - 1)); + lua_pushbooleancpp(L, PersistenceService::GetInstance().LoadGame(static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } // ----------------------------------------------------------------------------- static int SaveGame(lua_State *L) { - lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().SaveGame(static_cast(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2))); + lua_pushbooleancpp(L, PersistenceService::GetInstance().SaveGame(static_cast(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2))); return 1; } @@ -722,7 +722,7 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = { // ----------------------------------------------------------------------------- -bool BS_Kernel::_RegisterScriptBindings() { +bool Kernel::_RegisterScriptBindings() { ScriptEngine *pScript = static_cast(GetService("script")); BS_ASSERT(pScript); lua_State *L = static_cast(pScript->GetScriptObject()); -- cgit v1.2.3 From 086f5961b6575c50bb386750b6e9a3ed1efdd8cd Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 2 Sep 2010 12:14:04 +0000 Subject: SWORD25: unsigned int -> uint svn-id: r53309 --- engines/sword25/kernel/kernel_script.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp index f1c75bd691..16bb2d0636 100644 --- a/engines/sword25/kernel/kernel_script.cpp +++ b/engines/sword25/kernel/kernel_script.cpp @@ -87,7 +87,7 @@ static int GetSuperclassIdentifier(lua_State *L) { BS_ASSERT(pKernel); lua_pushstring(L, pKernel->GetSuperclassIdentifier( - static_cast(luaL_checknumber(L, 1))).c_str()); + static_cast(luaL_checknumber(L, 1))).c_str()); return 1; } @@ -110,7 +110,7 @@ static int GetServiceIdentifier(lua_State *L) { BS_ASSERT(pKernel); lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), - static_cast(luaL_checknumber(L, 2))).c_str()); + static_cast(luaL_checknumber(L, 2))).c_str()); return 1; } @@ -153,7 +153,7 @@ static int StartService(lua_State *L) { static int Sleep(lua_State *L) { Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); - pKernel->Sleep(static_cast(luaL_checknumber(L, 1) * 1000)); + pKernel->Sleep(static_cast(luaL_checknumber(L, 1) * 1000)); return 0; } @@ -563,7 +563,7 @@ static int SetMaxMemoryUsage(lua_State *L) { ResourceManager *pResource = pKernel->GetResourceManager(); BS_ASSERT(pResource); - pResource->SetMaxMemoryUsage(static_cast(lua_tonumber(L, 1))); + pResource->SetMaxMemoryUsage(static_cast(lua_tonumber(L, 1))); return 0; } @@ -655,7 +655,7 @@ static int GetSlotCount(lua_State *L) { static int IsSlotOccupied(lua_State *L) { lua_pushbooleancpp(L, PersistenceService::GetInstance().IsSlotOccupied( - static_cast(luaL_checknumber(L, 1)) - 1)); + static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } @@ -670,7 +670,7 @@ static int GetSavegameDirectory(lua_State *L) { static int IsSavegameCompatible(lua_State *L) { lua_pushbooleancpp(L, PersistenceService::GetInstance().IsSavegameCompatible( - static_cast(luaL_checknumber(L, 1)) - 1)); + static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } @@ -678,28 +678,28 @@ static int IsSavegameCompatible(lua_State *L) { static int GetSavegameDescription(lua_State *L) { lua_pushstring(L, PersistenceService::GetInstance().GetSavegameDescription( - static_cast(luaL_checknumber(L, 1)) - 1).c_str()); + static_cast(luaL_checknumber(L, 1)) - 1).c_str()); return 1; } // ----------------------------------------------------------------------------- static int GetSavegameFilename(lua_State *L) { - lua_pushstring(L, PersistenceService::GetInstance().GetSavegameFilename(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); + lua_pushstring(L, PersistenceService::GetInstance().GetSavegameFilename(static_cast(luaL_checknumber(L, 1)) - 1).c_str()); return 1; } // ----------------------------------------------------------------------------- static int LoadGame(lua_State *L) { - lua_pushbooleancpp(L, PersistenceService::GetInstance().LoadGame(static_cast(luaL_checknumber(L, 1)) - 1)); + lua_pushbooleancpp(L, PersistenceService::GetInstance().LoadGame(static_cast(luaL_checknumber(L, 1)) - 1)); return 1; } // ----------------------------------------------------------------------------- static int SaveGame(lua_State *L) { - lua_pushbooleancpp(L, PersistenceService::GetInstance().SaveGame(static_cast(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2))); + lua_pushbooleancpp(L, PersistenceService::GetInstance().SaveGame(static_cast(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2))); return 1; } -- cgit v1.2.3 From 54ccc8f4c906cd4f84c955581c0368886a7a9c78 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 3 Oct 2010 13:25:22 +0000 Subject: SWORD25: Enforced code naming conventions in script/* svn-id: r53391 --- engines/sword25/kernel/kernel_script.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/sword25/kernel/kernel_script.cpp') 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(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(GetService("script")); BS_ASSERT(pScript); - lua_State *L = static_cast(pScript->GetScriptObject()); + lua_State *L = static_cast(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; } -- cgit v1.2.3