diff options
author | Paul Gilbert | 2010-08-01 09:31:36 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 22:18:35 +0000 |
commit | 2006e564a1287ff31c2c6acedecf90034e784fd2 (patch) | |
tree | 4e1ebb10fedbd39f053691c3cd59b6157c545d37 /engines/sword25/math/vertex.h | |
parent | 53a9d2d0a1dab1119dc1cc12886321fa72743061 (diff) | |
download | scummvm-rg350-2006e564a1287ff31c2c6acedecf90034e784fd2.tar.gz scummvm-rg350-2006e564a1287ff31c2c6acedecf90034e784fd2.tar.bz2 scummvm-rg350-2006e564a1287ff31c2c6acedecf90034e784fd2.zip |
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
Diffstat (limited to 'engines/sword25/math/vertex.h')
-rw-r--r-- | engines/sword25/math/vertex.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/sword25/math/vertex.h b/engines/sword25/math/vertex.h index 5b4e6da0f8..65c179d654 100644 --- a/engines/sword25/math/vertex.h +++ b/engines/sword25/math/vertex.h @@ -46,13 +46,15 @@ #include <math.h> #include "sword25/kernel/common.h" -namespace { +namespace Lua { // Forward declarations struct lua_State; } +using namespace Lua; + namespace Sword25 { /** @@ -151,8 +153,8 @@ public: return sqrtf(static_cast<float>(X * X + Y * Y)); } - static BS_Vertex & LuaVertexToVertex(lua_State * L, int StackIndex, BS_Vertex & Vertex); - static void VertexToLuaVertex(lua_State * L, const BS_Vertex & Vertex); + static BS_Vertex &LuaVertexToVertex(lua_State *L, int StackIndex, BS_Vertex &Vertex); + static void VertexToLuaVertex(lua_State *L, const BS_Vertex &Vertex); }; } // End of namespace Sword25 |