Changeset 256 for trunk/src/object.cc

Timestamp:

06/14/14 21:06:00 (11 years ago)

Author:

epyon

Message:

• various minor fixes

File:

• trunk/src/object.cc (modified) (3 diffs)

trunk/src/object.cc

@@ -41 +41 @@
         if ( m_root )
         {
-                uid_store*  store = get_root()->get_uid_store();
-                if (store)
-                {
-                        m_uid = store->insert( this );
-                }
-        }
-
+                m_root->object_created( this );
+        }
 }
 
@@ -104 +99 @@
 object::~object()
 {
-        if ( m_lua_index != lua::ref_none )
-        {
-                lua::state* state = get_root()->get_lua_state();
-                state->unregister_object( this );
-        }
-        if ( m_uid != 0 && m_root )
-        {
-                uid_store* store = get_root()->get_uid_store();
-                if (store) store->remove( m_uid );
+        if ( m_root )
+        {
+                m_root->object_destroyed( this );
         }
         detach();
@@ -194 +183 @@
 }
 
-void object::register_type( type_database* db )
-{
-        type_field fields[] = {
-                type_field("id",          &object::m_id),
-                type_field("uid",         &object::m_uid).flag( TF_READONLY ), 
-                type_field("lua_index",   &object::m_lua_index).flag( TF_READONLY | TF_NOSERIALIZE ),
-                type_field("parent",      &object::m_parent).flag( TF_READONLY | TF_NOSERIALIZE ),
-                type_field("child_count", &object::m_child_count).flag( TF_READONLY ),
-                type_field("children"   , &object::m_children).flag( TF_READONLY ),
-        };
-        db->create_type<object>("object").fields(fields);
-}
+// void object::register_type( type_database* db )
+// {
+//      type_field fields[] = {
+//              type_field("id",          &object::m_id),
+//              type_field("uid",         &object::m_uid).flag( TF_READONLY ), 
+//              type_field("lua_index",   &object::m_lua_index).flag( TF_READONLY | TF_NOSERIALIZE ),
+//              type_field("parent",      &object::m_parent).flag( TF_READONLY | TF_NOSERIALIZE ),
+//              type_field("child_count", &object::m_child_count).flag( TF_READONLY ),
+//              type_field("children"   , &object::m_children).flag( TF_READONLY ),
+//      };
+//      db->create_type<object>("object").fields(fields);
+// }
 
 void nv::object::register_with_lua( const char* lua_name, const char* storage )