aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/math
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/math
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/math')
-rw-r--r--engines/sword25/math/vertex.cpp7
-rw-r--r--engines/sword25/math/vertex.h10
2 files changed, 1 insertions, 16 deletions
diff --git a/engines/sword25/math/vertex.cpp b/engines/sword25/math/vertex.cpp
index 4997da09d3..d9a709ab49 100644
--- a/engines/sword25/math/vertex.cpp
+++ b/engines/sword25/math/vertex.cpp
@@ -34,15 +34,8 @@
#include "sword25/math/vertex.h"
-namespace Lua {
-
-extern "C"
-{
#include "sword25/util/lua/lua.h"
#include "sword25/util/lua/lauxlib.h"
-}
-
-}
namespace Sword25 {
diff --git a/engines/sword25/math/vertex.h b/engines/sword25/math/vertex.h
index 18ea4c082c..b923841a0f 100644
--- a/engines/sword25/math/vertex.h
+++ b/engines/sword25/math/vertex.h
@@ -45,6 +45,7 @@
// Includes
#include <math.h>
#include "sword25/kernel/common.h"
+#include "sword25/util/lua/lua.h"
#if defined(MACOSX) || defined(SOLARIS) || defined(__MINGW32__)
// Older versions of Mac OS X didn't supply a powf function, so using it
@@ -63,15 +64,6 @@
#define atan2f(x,y) ((float)atan2(x,y))
#endif
-namespace Lua {
-
-// Forward declarations
-struct lua_State;
-
-}
-
-using namespace Lua;
-
namespace Sword25 {
/**