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/script/luacallback.h | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 engines/sword25/script/luacallback.h (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h new file mode 100755 index 0000000000..dbf201b4ad --- /dev/null +++ b/engines/sword25/script/luacallback.h @@ -0,0 +1,64 @@ +// ----------------------------------------------------------------------------- +// 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 +// ----------------------------------------------------------------------------- + +#ifndef BS_LUACALLBACK_H +#define BS_LUACALLBACK_H + +// ----------------------------------------------------------------------------- +// Includes +// ----------------------------------------------------------------------------- + +#include "kernel/common.h" + +// ----------------------------------------------------------------------------- +// Forward Deklarationen +// ----------------------------------------------------------------------------- + +struct lua_State; + +// ----------------------------------------------------------------------------- +// Klassendeklaration +// ----------------------------------------------------------------------------- + +class BS_LuaCallback +{ +public: + BS_LuaCallback(lua_State * L); + virtual ~BS_LuaCallback(); + + // Funktion muss auf dem Lua-Stack liegen. + void RegisterCallbackFunction(lua_State * L, unsigned int ObjectHandle); + + // Funktion muss auf dem Lua-Stack liegen. + void UnregisterCallbackFunction(lua_State * L, unsigned int ObjectHandle); + + void RemoveAllObjectCallbacks(lua_State * L, unsigned int ObjectHandle); + + void InvokeCallbackFunctions(lua_State * L, unsigned int ObjectHandle); + +protected: + virtual int PreFunctionInvokation(lua_State * L) { return 0; } + +private: + void EnsureObjectCallbackTableExists(lua_State * L,unsigned int ObjectHandle); + void PushCallbackTable(lua_State * L); + void PushObjectCallbackTable(lua_State * L, unsigned int ObjectHandle); +}; + +#endif -- cgit v1.2.3 From 65da804f583460739aec3bfe35b70310af1ee5a9 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 29 Jul 2010 19:55:28 +0000 Subject: SWORD25: Path fixes for includes svn-id: r53180 --- engines/sword25/script/luacallback.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h index dbf201b4ad..ba505cadfe 100755 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -17,14 +17,14 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // ----------------------------------------------------------------------------- -#ifndef BS_LUACALLBACK_H -#define BS_LUACALLBACK_H +#ifndef SWORD25_LUACALLBACK_H +#define SWORD25_LUACALLBACK_H // ----------------------------------------------------------------------------- // Includes // ----------------------------------------------------------------------------- -#include "kernel/common.h" +#include "sword25/kernel/common.h" // ----------------------------------------------------------------------------- // Forward Deklarationen -- 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/script/luacallback.h | 51 +++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 18 deletions(-) mode change 100755 => 100644 engines/sword25/script/luacallback.h (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h old mode 100755 new mode 100644 index ba505cadfe..96eeadca24 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -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 + * + */ #ifndef SWORD25_LUACALLBACK_H #define SWORD25_LUACALLBACK_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/script/luacallback.h | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h index 96eeadca24..6a5b43be8a 100644 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -42,38 +42,45 @@ #include "sword25/kernel/common.h" // ----------------------------------------------------------------------------- -// Forward Deklarationen +// Forward Declarations // ----------------------------------------------------------------------------- +namespace { + struct lua_State; +} + +namespace Sword25 { + // ----------------------------------------------------------------------------- -// Klassendeklaration +// Class definitions // ----------------------------------------------------------------------------- -class BS_LuaCallback -{ +class BS_LuaCallback { public: - BS_LuaCallback(lua_State * L); + BS_LuaCallback(::lua_State * L); virtual ~BS_LuaCallback(); // Funktion muss auf dem Lua-Stack liegen. - void RegisterCallbackFunction(lua_State * L, unsigned int ObjectHandle); + void RegisterCallbackFunction(::lua_State *L, unsigned int ObjectHandle); // Funktion muss auf dem Lua-Stack liegen. - void UnregisterCallbackFunction(lua_State * L, unsigned int ObjectHandle); + void UnregisterCallbackFunction(::lua_State *L, unsigned int ObjectHandle); - void RemoveAllObjectCallbacks(lua_State * L, unsigned int ObjectHandle); + void RemoveAllObjectCallbacks(::lua_State *L, unsigned int ObjectHandle); - void InvokeCallbackFunctions(lua_State * L, unsigned int ObjectHandle); + void InvokeCallbackFunctions(::lua_State *L, unsigned int ObjectHandle); protected: - virtual int PreFunctionInvokation(lua_State * L) { return 0; } + virtual int PreFunctionInvokation(::lua_State *L) { return 0; } private: - void EnsureObjectCallbackTableExists(lua_State * L,unsigned int ObjectHandle); - void PushCallbackTable(lua_State * L); - void PushObjectCallbackTable(lua_State * L, unsigned int ObjectHandle); + void EnsureObjectCallbackTableExists(::lua_State *L,unsigned int ObjectHandle); + void PushCallbackTable(::lua_State *L); + void PushObjectCallbackTable(::lua_State *L, unsigned int ObjectHandle); }; +} // End of namespace Sword25 + #endif -- cgit v1.2.3 From 2006e564a1287ff31c2c6acedecf90034e784fd2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 1 Aug 2010 09:31:36 +0000 Subject: SWORD25: Moved the Lua library into it's own namespace Previously with some of the files I was leaving the #include references to the library inside the global namespace. However, since the engine itself is now inside a namespace, I had to do a lot of changes, such as lua_State to ::lua_State. This way is cleaner, and I just need to add a 'using namespace Lua' where needed. svn-id: r53198 --- engines/sword25/script/luacallback.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h index 6a5b43be8a..7b7bbbe024 100644 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -45,12 +45,14 @@ // Forward Declarations // ----------------------------------------------------------------------------- -namespace { +namespace Lua { struct lua_State; } +using namespace Lua; + namespace Sword25 { // ----------------------------------------------------------------------------- @@ -59,26 +61,26 @@ namespace Sword25 { class BS_LuaCallback { public: - BS_LuaCallback(::lua_State * L); + BS_LuaCallback(lua_State * L); virtual ~BS_LuaCallback(); // Funktion muss auf dem Lua-Stack liegen. - void RegisterCallbackFunction(::lua_State *L, unsigned int ObjectHandle); + void RegisterCallbackFunction(lua_State *L, unsigned int ObjectHandle); // Funktion muss auf dem Lua-Stack liegen. - void UnregisterCallbackFunction(::lua_State *L, unsigned int ObjectHandle); + void UnregisterCallbackFunction(lua_State *L, unsigned int ObjectHandle); - void RemoveAllObjectCallbacks(::lua_State *L, unsigned int ObjectHandle); + void RemoveAllObjectCallbacks(lua_State *L, unsigned int ObjectHandle); - void InvokeCallbackFunctions(::lua_State *L, unsigned int ObjectHandle); + void InvokeCallbackFunctions(lua_State *L, unsigned int ObjectHandle); protected: - virtual int PreFunctionInvokation(::lua_State *L) { return 0; } + virtual int PreFunctionInvokation(lua_State *L) { return 0; } private: - void EnsureObjectCallbackTableExists(::lua_State *L,unsigned int ObjectHandle); - void PushCallbackTable(::lua_State *L); - void PushObjectCallbackTable(::lua_State *L, unsigned int ObjectHandle); + void EnsureObjectCallbackTableExists(lua_State *L,unsigned int ObjectHandle); + void PushCallbackTable(lua_State *L); + void PushObjectCallbackTable(lua_State *L, unsigned int ObjectHandle); }; } // 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/script/luacallback.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h index 7b7bbbe024..b8ac97fd95 100644 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -23,7 +23,7 @@ * */ -/* +/* * This code is based on Broken Sword 2.5 engine * * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer @@ -61,7 +61,7 @@ namespace Sword25 { class BS_LuaCallback { public: - BS_LuaCallback(lua_State * L); + BS_LuaCallback(lua_State *L); virtual ~BS_LuaCallback(); // Funktion muss auf dem Lua-Stack liegen. @@ -75,10 +75,12 @@ public: void InvokeCallbackFunctions(lua_State *L, unsigned int ObjectHandle); protected: - virtual int PreFunctionInvokation(lua_State *L) { return 0; } + virtual int PreFunctionInvokation(lua_State *L) { + return 0; + } private: - void EnsureObjectCallbackTableExists(lua_State *L,unsigned int ObjectHandle); + void EnsureObjectCallbackTableExists(lua_State *L, unsigned int ObjectHandle); void PushCallbackTable(lua_State *L); void PushObjectCallbackTable(lua_State *L, unsigned int ObjectHandle); }; -- 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/script/luacallback.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h index b8ac97fd95..89ab67a52e 100644 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -59,10 +59,10 @@ namespace Sword25 { // Class definitions // ----------------------------------------------------------------------------- -class BS_LuaCallback { +class LuaCallback { public: - BS_LuaCallback(lua_State *L); - virtual ~BS_LuaCallback(); + LuaCallback(lua_State *L); + virtual ~LuaCallback(); // Funktion muss auf dem Lua-Stack liegen. void RegisterCallbackFunction(lua_State *L, unsigned int ObjectHandle); -- 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/script/luacallback.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h index 89ab67a52e..e8f4a9cf02 100644 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -65,14 +65,14 @@ public: virtual ~LuaCallback(); // Funktion muss auf dem Lua-Stack liegen. - void RegisterCallbackFunction(lua_State *L, unsigned int ObjectHandle); + void RegisterCallbackFunction(lua_State *L, uint ObjectHandle); // Funktion muss auf dem Lua-Stack liegen. - void UnregisterCallbackFunction(lua_State *L, unsigned int ObjectHandle); + void UnregisterCallbackFunction(lua_State *L, uint ObjectHandle); - void RemoveAllObjectCallbacks(lua_State *L, unsigned int ObjectHandle); + void RemoveAllObjectCallbacks(lua_State *L, uint ObjectHandle); - void InvokeCallbackFunctions(lua_State *L, unsigned int ObjectHandle); + void InvokeCallbackFunctions(lua_State *L, uint ObjectHandle); protected: virtual int PreFunctionInvokation(lua_State *L) { @@ -80,9 +80,9 @@ protected: } private: - void EnsureObjectCallbackTableExists(lua_State *L, unsigned int ObjectHandle); + void EnsureObjectCallbackTableExists(lua_State *L, uint ObjectHandle); void PushCallbackTable(lua_State *L); - void PushObjectCallbackTable(lua_State *L, unsigned int ObjectHandle); + void PushObjectCallbackTable(lua_State *L, uint ObjectHandle); }; } // End of namespace Sword25 -- 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/script/luacallback.h | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'engines/sword25/script/luacallback.h') diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h index e8f4a9cf02..0a5dec17d9 100644 --- a/engines/sword25/script/luacallback.h +++ b/engines/sword25/script/luacallback.h @@ -35,16 +35,8 @@ #ifndef SWORD25_LUACALLBACK_H #define SWORD25_LUACALLBACK_H -// ----------------------------------------------------------------------------- -// Includes -// ----------------------------------------------------------------------------- - #include "sword25/kernel/common.h" -// ----------------------------------------------------------------------------- -// Forward Declarations -// ----------------------------------------------------------------------------- - namespace Lua { struct lua_State; @@ -55,34 +47,30 @@ using namespace Lua; namespace Sword25 { -// ----------------------------------------------------------------------------- -// Class definitions -// ----------------------------------------------------------------------------- - class LuaCallback { public: LuaCallback(lua_State *L); virtual ~LuaCallback(); // Funktion muss auf dem Lua-Stack liegen. - void RegisterCallbackFunction(lua_State *L, uint ObjectHandle); + void registerCallbackFunction(lua_State *L, uint objectHandle); // Funktion muss auf dem Lua-Stack liegen. - void UnregisterCallbackFunction(lua_State *L, uint ObjectHandle); + void unregisterCallbackFunction(lua_State *L, uint objectHandle); - void RemoveAllObjectCallbacks(lua_State *L, uint ObjectHandle); + void removeAllObjectCallbacks(lua_State *L, uint objectHandle); - void InvokeCallbackFunctions(lua_State *L, uint ObjectHandle); + void invokeCallbackFunctions(lua_State *L, uint objectHandle); protected: - virtual int PreFunctionInvokation(lua_State *L) { + virtual int preFunctionInvokation(lua_State *L) { return 0; } private: - void EnsureObjectCallbackTableExists(lua_State *L, uint ObjectHandle); - void PushCallbackTable(lua_State *L); - void PushObjectCallbackTable(lua_State *L, uint ObjectHandle); + void ensureObjectCallbackTableExists(lua_State *L, uint objectHandle); + void pushCallbackTable(lua_State *L); + void pushObjectCallbackTable(lua_State *L, uint objectHandle); }; } // End of namespace Sword25 -- cgit v1.2.3