Changeset 263 for trunk/src

Timestamp:

06/19/14 00:26:00 (11 years ago)

Author:

epyon

Message:

• cleaned up sneaky lua map_area registration

Location:

trunk/src/lua

Files:

• lua_map_area.cc (modified) (3 diffs)
• lua_state.cc (modified) (1 diff)

trunk/src/lua/lua_map_area.cc

@@ -54 +54 @@
 nv::map_area* nv::lua::detail::to_map_area( lua_State* L, int index )
 {
-        if ( lua_type( L, index ) == LUA_TTABLE )
-        {
-                nv::map_area* o = nullptr;
-                if ( lua_istable( L , index ) )
+        nv::map_area* o = nullptr;
+        if ( lua_istable( L , index ) )
+        {
+                lua_pushstring( L, "__map_area_ptr" );
+                lua_rawget( L, index );
+                if ( lua_isuserdata( L, -1 ) )
                 {
-                        lua_pushstring( L, "__map_area_ptr" );
-                        lua_rawget( L, index );
-                        if ( lua_isuserdata( L, -1 ) )
-                        {
-                                o = static_cast<nv::map_area*>( lua_touserdata( L, -1 ) );
-                        } 
-                        lua_pop( L, 1 );
-                }
-                return o;
+                        o = static_cast<nv::map_area*>( lua_touserdata( L, -1 ) );
+                } 
+                lua_pop( L, 1 );
         }
         else
@@ -73 +69 @@
                 return *(nv::map_area**)luaL_checkudata( L, index, NLUA_MAP_AREA_METATABLE );
         }
+        return o;
 }
 
@@ -235 +232 @@
         luaopen_map_area(L);
 }
+
+void nv::lua::register_map_area_instance( lua_State* L, int object_index, map_area* area )
+{
+        lua_rawgeti( L, LUA_REGISTRYINDEX, object_index );
+        lua_pushstring( L, "__map_area_ptr" );
+        lua_pushlightuserdata( L, (map_area*)area );
+        lua_rawset( L, -3 );
+        lua_pop( L, 1 );
+}

trunk/src/lua/lua_state.cc

@@ -422 +422 @@
 {
         if ( object_index == ref_nil ) return;
-        stack_guard guard( this );
         lua_rawgeti( m_state, LUA_REGISTRYINDEX, object_index );
         lua_pushstring( m_state, metaname.c_str() );