aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/script
diff options
context:
space:
mode:
authorEugene Sandulenko2010-10-18 17:12:00 +0000
committerEugene Sandulenko2010-10-18 17:12:00 +0000
commit3feac393b0c951c53d96181b320dd42f5c725f35 (patch)
tree9fdf2fa312777288a76356c21e2d2098fd752d0f /engines/sword25/script
parent3b21db16188899eac9914fe1c3b32b311a3aa344 (diff)
downloadscummvm-rg350-3feac393b0c951c53d96181b320dd42f5c725f35.tar.gz
scummvm-rg350-3feac393b0c951c53d96181b320dd42f5c725f35.tar.bz2
scummvm-rg350-3feac393b0c951c53d96181b320dd42f5c725f35.zip
SWORD25: Renamed Lua .c files to .cpp and make it compilable
svn-id: r53568
Diffstat (limited to 'engines/sword25/script')
-rw-r--r--engines/sword25/script/luabindhelper.h9
-rw-r--r--engines/sword25/script/luacallback.cpp7
-rw-r--r--engines/sword25/script/luacallback.h6
-rw-r--r--engines/sword25/script/luascript.cpp8
-rw-r--r--engines/sword25/script/luascript.h9
5 files changed, 1 insertions, 38 deletions
diff --git a/engines/sword25/script/luabindhelper.h b/engines/sword25/script/luabindhelper.h
index 0dbaaa3186..dc45104d53 100644
--- a/engines/sword25/script/luabindhelper.h
+++ b/engines/sword25/script/luabindhelper.h
@@ -37,17 +37,8 @@
#include "sword25/kernel/common.h"
-namespace Lua {
-
-extern "C"
-{
#include "sword25/util/lua/lua.h"
#include "sword25/util/lua/lauxlib.h"
-}
-
-}
-
-using namespace Lua;
namespace Sword25 {
diff --git a/engines/sword25/script/luacallback.cpp b/engines/sword25/script/luacallback.cpp
index 6d2e634632..bb2c821aa8 100644
--- a/engines/sword25/script/luacallback.cpp
+++ b/engines/sword25/script/luacallback.cpp
@@ -35,18 +35,11 @@
#include "sword25/script/luacallback.h"
#include "sword25/script/luabindhelper.h"
-namespace Lua {
-
-extern "C"
-{
#include "sword25/util/lua/lua.h"
#include "sword25/util/lua/lauxlib.h"
-}
const char *CALLBACKTABLE_NAME = "__CALLBACKS";
-}
-
namespace Sword25 {
#define BS_LOG_PREFIX "LUA"
diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h
index 0a5dec17d9..e097f5b499 100644
--- a/engines/sword25/script/luacallback.h
+++ b/engines/sword25/script/luacallback.h
@@ -37,14 +37,8 @@
#include "sword25/kernel/common.h"
-namespace Lua {
-
struct lua_State;
-}
-
-using namespace Lua;
-
namespace Sword25 {
class LuaCallback {
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index 6c01ca1de5..a16959656d 100644
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -45,21 +45,13 @@
#include "sword25/kernel/outputpersistenceblock.h"
#include "sword25/kernel/inputpersistenceblock.h"
-namespace Lua {
-
-extern "C" {
#include "sword25/util/lua/lua.h"
#include "sword25/util/lua/lualib.h"
#include "sword25/util/lua/lauxlib.h"
#include "sword25/util/pluto/pluto.h"
-}
-
-}
namespace Sword25 {
-using namespace Lua;
-
LuaScriptEngine::LuaScriptEngine(Kernel *KernelPtr) :
ScriptEngine(KernelPtr),
_state(0),
diff --git a/engines/sword25/script/luascript.h b/engines/sword25/script/luascript.h
index f557ae45f1..b66c32176a 100644
--- a/engines/sword25/script/luascript.h
+++ b/engines/sword25/script/luascript.h
@@ -39,14 +39,7 @@
#include "common/str-array.h"
#include "sword25/kernel/common.h"
#include "sword25/script/script.h"
-
-namespace Lua {
-
-struct lua_State;
-
-}
-
-using namespace Lua;
+#include "sword25/util/lua/lua.h"
namespace Sword25 {