Changeset 288 for trunk/src/lua

Timestamp:

07/23/14 17:37:44 (11 years ago)

Author:

epyon

Message:

• unified animation_entry class
• virtuals removed from animation_entry
• lua_table - added missing get_float
• lua_table - fixed has_field

File:

• trunk/src/lua/lua_state.cc (modified) (2 diffs)

trunk/src/lua/lua_state.cc

@@ -148 +148 @@
 {
         lua_getfield( m_state, -1, element.c_str() );
-        bool result = lua_isnil( m_state, -1 );
+        bool result = !( lua_isnil( m_state, -1 ) );
         lua_pop( m_state, 1 );
         return result;
@@ -189 +189 @@
         lua_getfield( m_state, -1, element.c_str() );
         double result = lua_type( m_state, -1 ) == LUA_TNUMBER ? lua_tonumber( m_state, -1 ) : defval;
+        lua_pop( m_state, 1 );
+        return result;
+}
+
+
+float nv::lua::table_guard::get_float( const std::string& element, float defval /*= 0.0 */ )
+{
+        lua_getfield( m_state, -1, element.c_str() );
+        float result = lua_type( m_state, -1 ) == LUA_TNUMBER ? (float)lua_tonumber( m_state, -1 ) : defval;
         lua_pop( m_state, 1 );
         return result;