From ce8e259441410aba3f2345333003032ed9c45d65 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 10 Dec 2018 11:46:29 +0800
Subject: =?UTF-8?q?*=E5=88=A0=E9=99=A4shared=E7=9A=84lua=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lua/common/je_lua_object.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/lua/common/je_lua_object.cpp')

diff --git a/src/lua/common/je_lua_object.cpp b/src/lua/common/je_lua_object.cpp
index 9aabeb5..c35356e 100644
--- a/src/lua/common/je_lua_object.cpp
+++ b/src/lua/common/je_lua_object.cpp
@@ -12,7 +12,7 @@ namespace JinEngine
             {
                 shared = obj;
                 shared->retain();
-                dependencies = new std::map<uint, Shared*>();
+                dependencies = new std::map<uint, LuaObject*>();
             }
         }
 
@@ -35,7 +35,7 @@ namespace JinEngine
 
         const char* LuaObject::getObjectType()
         {
-            return shared->getType();
+            return type;
         }
 
         Shared* LuaObject::getShared()
@@ -43,11 +43,11 @@ namespace JinEngine
             return shared;
         }
 
-        void LuaObject::setDependency(uint key, Shared* dep)
+        void LuaObject::setDependency(uint key, LuaObject* dep)
         {
             removeDependency(key);
-            dependencies->insert(std::pair<uint, Shared*>(key, dep));
-            luax_addreference(state, shared, dep);
+            dependencies->insert(std::pair<uint, LuaObject*>(key, dep));
+            luax_addreference(state, this, dep);
         }
 
         void LuaObject::removeDependency(uint key)
@@ -55,19 +55,19 @@ namespace JinEngine
             if (!isDependOn(key))
                 return;
             DepsMap::iterator it = dependencies->find(key);
-            Shared* dep = it->second;
-            luax_removereference(state, shared, dep);
+            LuaObject* dep = it->second;
+            luax_removereference(state, this, dep);
             dependencies->erase(it);
         }
 
-        void LuaObject::removeDependency(Shared* dependency)
+        void LuaObject::removeDependency(LuaObject* dependency)
         {
             for (DepsMap::iterator it = dependencies->begin(); it != dependencies->end();)
             {
-                Shared* dep = it->second;
+                LuaObject* dep = it->second;
                 if (dep == dependency)
                 {
-                    luax_removereference(state, shared, dep);
+                    luax_removereference(state, this, dep);
                     dependencies->erase(it);
                 }
                 else
@@ -80,9 +80,9 @@ namespace JinEngine
             return dependencies->find(key) != dependencies->end();
         }
 
-        bool LuaObject::isDependOn(Shared* shared)
+        bool LuaObject::isDependOn(LuaObject* shared)
         {
-            for (std::pair<uint, Shared*> dep : (*dependencies))
+            for (std::pair<uint, LuaObject*> dep : (*dependencies))
             {
                 if (dep.second == shared)
                     return true;
@@ -92,11 +92,11 @@ namespace JinEngine
 
         void LuaObject::clearDependencies()
         {
-            luax_removereference(state, shared);
+            luax_removereference(state, this);
             dependencies->clear();
         }
 
-        Shared* LuaObject::getDependency(uint key)
+        LuaObject* LuaObject::getDependency(uint key)
         {
             if (!isDependOn(key))
                 return nullptr;
-- 
cgit v1.1-26-g67d0