aboutsummaryrefslogtreecommitdiff
path: root/src/lua/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/lua/common')
-rw-r--r--src/lua/common/je_lua.h2
-rw-r--r--src/lua/common/je_lua_reference.cpp2
-rw-r--r--src/lua/common/je_lua_shared.cpp4
-rw-r--r--src/lua/common/je_lua_shared.hpp11
4 files changed, 12 insertions, 7 deletions
diff --git a/src/lua/common/je_lua.h b/src/lua/common/je_lua.h
index b6fc878..66647aa 100644
--- a/src/lua/common/je_lua.h
+++ b/src/lua/common/je_lua.h
@@ -15,6 +15,8 @@ namespace JinEngine
namespace Lua
{
+ // Extends luax.h library.
+
///
///
///
diff --git a/src/lua/common/je_lua_reference.cpp b/src/lua/common/je_lua_reference.cpp
index 37ed441..72c1c3e 100644
--- a/src/lua/common/je_lua_reference.cpp
+++ b/src/lua/common/je_lua_reference.cpp
@@ -10,7 +10,9 @@ namespace JinEngine
LuaRef::LuaRef(lua_State* L, int i)
: mL(L)
{
+ // Get value.
luax_pushvalue(mL, i);
+ // Set reference.
luax_getreferencestable(L);
luax_pushvalue(mL, -2);
mIndex = luax_ref(mL, -2);
diff --git a/src/lua/common/je_lua_shared.cpp b/src/lua/common/je_lua_shared.cpp
index 55832fd..acf1494 100644
--- a/src/lua/common/je_lua_shared.cpp
+++ b/src/lua/common/je_lua_shared.cpp
@@ -36,7 +36,7 @@ namespace JinEngine
{
if (!isDependOn(key))
return;
- std::map<int, SharedBase*>::iterator it = mDependencies.find(key);
+ DepsMap::iterator it = mDependencies.find(key);
SharedBase* dep = it->second;
// Remove lua reference.
luax_removereference(mL, this, dep);
@@ -46,7 +46,7 @@ namespace JinEngine
void SharedBase::removeDependency(SharedBase* dependency)
{
- for (std::map<int, SharedBase*>::iterator it = mDependencies.begin(); it != mDependencies.end();)
+ for (DepsMap::iterator it = mDependencies.begin(); it != mDependencies.end();)
{
SharedBase* dep = it->second;
if (dep == dependency)
diff --git a/src/lua/common/je_lua_shared.hpp b/src/lua/common/je_lua_shared.hpp
index 2f1e18b..579a38e 100644
--- a/src/lua/common/je_lua_shared.hpp
+++ b/src/lua/common/je_lua_shared.hpp
@@ -1,8 +1,6 @@
#ifndef __JIN_COMMON_SHARED_H__
#define __JIN_COMMON_SHARED_H__
-//#include "je_lua.h"
-
#include <map>
#include <vector>
#include <functional>
@@ -59,10 +57,13 @@ namespace JinEngine
clearDependencies();
}
- void* mObject;
- int mCount;
+ using DepsMap = std::map<int, SharedBase*>;
+
+ void* mObject;
+ int mCount;
lua_State* mL;
- std::map<int, SharedBase*> mDependencies;
+ DepsMap mDependencies;
+
};
template<class T>