SWORD25: Converted Lua interface classes

svn-id: r53195

4 files changed, 178 insertions, 230 deletions

diff --git a/engines/sword25/kernel/inputpersistenceblock.h b/engines/sword25/kernel/inputpersistenceblock.h
index a129f89b1d..6e1ec39943 100644
--- a/engines/sword25/kernel/inputpersistenceblock.h
+++ b/engines/sword25/kernel/inputpersistenceblock.h
@@ -45,30 +45,29 @@
 #include <vector>
 #include "sword25/kernel/memlog_on.h"
 
+namespace Sword25 {
 
 // -----------------------------------------------------------------------------
 // Class declaration
 // -----------------------------------------------------------------------------
 
-class BS_InputPersistenceBlock : public BS_PersistenceBlock
-{
+class BS_InputPersistenceBlock : public BS_PersistenceBlock {
 public:
-	enum ErrorState
-	{
+	enum ErrorState {
 		NONE,
 		END_OF_DATA,
 		OUT_OF_SYNC
 	};
 
-	BS_InputPersistenceBlock(const void * Data, unsigned int DataLength);
+	BS_InputPersistenceBlock(const void *Data, unsigned int DataLength);
 	virtual ~BS_InputPersistenceBlock();
 
-	void Read(signed int & Value);
-	void Read(unsigned int & Value);
-	void Read(float & Value);
-	void Read(bool & Value);
-	void Read(std::string & Value);
-	void Read(std::vector<unsigned char> & Value);
+	void Read(signed int &Value);
+	void Read(unsigned int &Value);
+	void Read(float &Value);
+	void Read(bool &Value);
+	void Read(std::string &Value);
+	void Read(std::vector<unsigned char> &Value);
 
 	bool IsGood() const { return m_ErrorState == NONE; }
 	ErrorState GetErrorState() const { return m_ErrorState; }
@@ -76,11 +75,13 @@ public:
 private:
 	bool CheckMarker(unsigned char Marker);
 	bool CheckBlockSize(int Size);
-	void RawRead(void * DestPtr, size_t Size);
+	void RawRead(void *DestPtr, size_t Size);
 
-	std::vector<unsigned char> m_Data;
-	std::vector<unsigned char>::const_iterator m_Iter;
+	Common::Array<unsigned char> m_Data;
+	Common::Array<unsigned char>::const_iterator m_Iter;
 	ErrorState m_ErrorState;
 };
 
+} // End of namespace Sword25
+
 #endif
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<unsigned int>(luaL_checknumber(L,1))).c_str());
+	lua_pushstring(L, pKernel->GetSuperclassIdentifier(
+		static_cast<unsigned int>(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<unsigned int>(luaL_checknumber(L, 2))).c_str());
+	lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1), 
+		static_cast<unsigned int>(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<lua_Number>(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<unsigned int>(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<BS_ScriptEngine *>(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<int>(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<int>(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<int>(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<int>(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<unsigned int>(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<unsigned int>(luaL_checknumber(L, 1)) - 1));
+static int IsSlotOccupied(lua_State *L) {
+	lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSlotOccupied(
+		static_cast<unsigned int>(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<unsigned int>(luaL_checknumber(L, 1)) - 1));
+static int IsSavegameCompatible(lua_State *L) {
+	lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSavegameCompatible(
+		static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1));
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
-static int GetSavegameDescription(lua_State * L)
-{
-	lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription(static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1).c_str());
+static int GetSavegameDescription(lua_State *L) {
+	lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription(
+		static_cast<unsigned int>(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<unsigned int>(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<unsigned int>(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<unsigned int>(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<BS_ScriptEngine *>(GetService("script"));
 	BS_ASSERT(pScript);
-	lua_State * L = static_cast<lua_State *>(pScript->GetScriptObject());
+	lua_State *L = static_cast<lua_State *>(pScript->GetScriptObject());
 	BS_ASSERT(L);
 
 	if (!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
diff --git a/engines/sword25/kernel/outputpersistenceblock.h b/engines/sword25/kernel/outputpersistenceblock.h
index 252cb5f03c..adc0105dd2 100644
--- a/engines/sword25/kernel/outputpersistenceblock.h
+++ b/engines/sword25/kernel/outputpersistenceblock.h
@@ -41,17 +41,14 @@
 
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/persistenceblock.h"
-#include "sword25/kernel/memlog_off.h"
-#include <vector>
-#include "sword25/kernel/memlog_on.h"
 
+namespace Sword25 {
 
 // -----------------------------------------------------------------------------
 // Class declaration
 // -----------------------------------------------------------------------------
 
-class BS_OutputPersistenceBlock : public BS_PersistenceBlock
-{
+class BS_OutputPersistenceBlock : public BS_PersistenceBlock {
 public:
 	BS_OutputPersistenceBlock();
 
@@ -59,17 +56,19 @@ public:
 	void Write(unsigned int Value);
 	void Write(float Value);
 	void Write(bool Value);
-	void Write(const std::string & String);
-	void Write(const void * BufferPtr, size_t Size);
+	void Write(const Common::String &String);
+	void Write(const void *BufferPtr, size_t Size);
 
-	const void * GetData() const { return &m_Data[0]; }
+	const void *GetData() const { return &m_Data[0]; }
 	unsigned int GetDataSize() const { return m_Data.size(); }
 
 private:
 	void WriteMarker(unsigned char Marker);
-	void RawWrite(const void * DataPtr, size_t Size);
+	void RawWrite(const void *DataPtr, size_t Size);
 
-	std::vector<unsigned char> m_Data;
+	Common::Array<unsigned char> m_Data;
 };
 
+} // End of namespace Sword25
+
 #endif
diff --git a/engines/sword25/kernel/persistenceblock.h b/engines/sword25/kernel/persistenceblock.h
index c3f78a0804..1417d3df69 100644
--- a/engines/sword25/kernel/persistenceblock.h
+++ b/engines/sword25/kernel/persistenceblock.h
@@ -41,23 +41,24 @@
 
 #include "sword25/kernel/common.h"
 
+namespace Sword25 {
 
 // -----------------------------------------------------------------------------
 // Class definition
 // -----------------------------------------------------------------------------
 
-class BS_PersistenceBlock
-{
+class BS_PersistenceBlock {
 public:
 	static unsigned int GetSInt32Size() { return sizeof(signed int) + sizeof(unsigned char); }
 	static unsigned int GetUInt32Size() { return sizeof(unsigned int) + sizeof(unsigned char); }
 	static unsigned int GetFloat32Size() { return sizeof(float) + sizeof(unsigned char); }
 	static unsigned int GetBoolSize() { return sizeof(unsigned char) + sizeof(unsigned char); }
-	static unsigned int GetStringSize(const std::string & String) { return static_cast<unsigned int>(sizeof(unsigned int) + String.size() + sizeof(unsigned char)); }
+	static unsigned int GetStringSize(const Common::String &String) { 
+		return static_cast<unsigned int>(sizeof(unsigned int) + String.size() + sizeof(unsigned char)); 
+	}
 
 protected:
-	enum
-	{
+	enum {
 		SINT_MARKER,
 		UINT_MARKER,
 		FLOAT_MARKER,
@@ -70,43 +71,38 @@ protected:
 	// Endianess Conversions
 	// -----------------------------------------------------------------------------
 	//
-	// Alles wird in Little Endian gespeichert.
-	// Auf Big Endian-Systemen muss die Bytereihenfolge daher vor dem Speichern und nach dem Einlesen gespeicherter Werte vertauscht werden.
+	// Everything is stored in Little Endian
+	// Big Endian Systems will need to be byte swapped during both saving and reading of saved values
 	//
 
 	template<typename T>
-	static T ConvertEndianessFromSystemToStorage(T Value)
-	{
+	static T ConvertEndianessFromSystemToStorage(T Value) {
 		if (IsBigEndian()) ReverseByteOrder(&Value);
 		return Value;
 	}
 
 	template<typename T>
-	static T ConvertEndianessFromStorageToSystem(T Value)
-	{
+	static T ConvertEndianessFromStorageToSystem(T Value) {
 		if (IsBigEndian()) ReverseByteOrder(&Value);
 		return Value;
 	}
 
 private:
-	static bool IsBigEndian()
-	{
+	static bool IsBigEndian() {
 		unsigned int Dummy = 1;
 		unsigned char * DummyPtr = reinterpret_cast<unsigned char *>(&Dummy);
 		return DummyPtr[0] == 0;
 	}
 
 	template<typename T>
-	static void Swap(T & One, T & Two)
-	{
+	static void Swap(T &One, T &Two) {
 		T Temp = One;
 		One = Two;
 		Two = Temp;
 	}
 
-	static void ReverseByteOrder(void * Ptr)
-	{
-		// Kehrt die Bytereihenfolge des 32-Bit Wortes um auf das Ptr zeigt.
+	static void ReverseByteOrder(void *Ptr) {
+		// Reverses the byte order of the 32-bit word pointed to by Ptr
 		unsigned char * CharPtr = static_cast<unsigned char *>(Ptr);
 		Swap(CharPtr[0], CharPtr[3]);
 		Swap(CharPtr[1], CharPtr[2]);
@@ -124,4 +120,6 @@ CTASSERT(sizeof(unsigned int) == 4);
 CTASSERT(sizeof(float) == 4);
 #undef CTASSERT
 
+} // End of namespace Sword25
+
 #endif