Index: trunk/src/gfx/keyframed_mesh.cc
===================================================================
--- trunk/src/gfx/keyframed_mesh.cc	(revision 280)
+++ trunk/src/gfx/keyframed_mesh.cc	(revision 281)
@@ -139,8 +139,8 @@
 	m_loc_next_position = a_program->get_attribute( "nv_next_position" )->get_location();
 	m_loc_next_normal   = a_program->get_attribute( "nv_next_normal" )->get_location();
-	m_va = a_device->create_vertex_array( a_data, nv::STATIC_DRAW );
-	vertex_buffer* vb = m_va->find_buffer( nv::POSITION );
-	m_va->add_vertex_buffer( m_loc_next_position, vb, nv::FLOAT, 3, 0,              sizeof( vertex_pn ), false );
-	m_va->add_vertex_buffer( m_loc_next_normal,   vb, nv::FLOAT, 3, sizeof( vec3 ), sizeof( vertex_pn ), false );
+	m_va = a_device->create_vertex_array( a_data, STATIC_DRAW );
+	vertex_buffer* vb = m_va->find_buffer( slot::POSITION );
+	m_va->add_vertex_buffer( m_loc_next_position, vb, FLOAT, 3, 0,              sizeof( vertex_pn ), false );
+	m_va->add_vertex_buffer( m_loc_next_normal,   vb, FLOAT, 3, sizeof( vec3 ), sizeof( vertex_pn ), false );
 }
 
Index: trunk/src/gfx/skeletal_mesh.cc
===================================================================
--- trunk/src/gfx/skeletal_mesh.cc	(revision 280)
+++ trunk/src/gfx/skeletal_mesh.cc	(revision 281)
@@ -43,5 +43,5 @@
 		m_animation->update_skeleton( m_transform.data(), (float)m_animation_time * 0.001f );
 		m_mesh_data->apply( m_transform.data() );
-		vertex_buffer* vb = m_va->find_buffer( nv::POSITION );
+		vertex_buffer* vb = m_va->find_buffer( nv::slot::POSITION );
 		vb->bind();
 		vb->update( m_mesh_data->data(), 0, m_mesh_data->size() );
Index: trunk/src/gui/gui_renderer.cc
===================================================================
--- trunk/src/gui/gui_renderer.cc	(revision 280)
+++ trunk/src/gui/gui_renderer.cc	(revision 281)
@@ -268,7 +268,7 @@
 	{
 		nv::vertex_buffer* vb = (nv::vertex_buffer*)sr->buffer.get_buffer();
-		sr->varray->update_vertex_buffer( nv::POSITION, vb, false );
-		sr->varray->update_vertex_buffer( nv::TEXCOORD, vb, false );
-		sr->varray->update_vertex_buffer( nv::COLOR,    vb, false );
+		sr->varray->update_vertex_buffer( nv::slot::POSITION, vb, false );
+		sr->varray->update_vertex_buffer( nv::slot::TEXCOORD, vb, false );
+		sr->varray->update_vertex_buffer( nv::slot::COLOR,    vb, false );
 	}
 	sr->texture->bind( nv::TEX_DIFFUSE );
Index: trunk/src/io/string_table.cc
===================================================================
--- trunk/src/io/string_table.cc	(revision 280)
+++ trunk/src/io/string_table.cc	(revision 281)
@@ -70,2 +70,9 @@
 }
 
+nv::uint32 nv::string_table_creator::dump_size() const
+{
+	return sizeof( index ) + sizeof( uint32 ) +
+		sizeof( offset ) * m_offsets.size() +
+		sizeof( char ) * m_data.size();
+}
+