Index: trunk/src/gl/gl_device.cc
===================================================================
--- trunk/src/gl/gl_device.cc	(revision 228)
+++ trunk/src/gl/gl_device.cc	(revision 229)
@@ -49,6 +49,6 @@
 	SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
 
-	SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
-	SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
+//	SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
+//	SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
 
 #if NV_SDL_VERSION == NV_SDL_20
Index: trunk/src/resource_manager.cc
===================================================================
--- trunk/src/resource_manager.cc	(revision 228)
+++ trunk/src/resource_manager.cc	(revision 229)
@@ -14,10 +14,10 @@
 }
 
-resource::ptr resource_manager::get_raw_resource(uint32 id) const
+resource* resource_manager::get_raw_resource(uint32 id) const
 {
 	return m_data[ id ];
 }
 
-resource::ptr resource_manager::get_raw_resource(const std::string& id) const
+resource* resource_manager::get_raw_resource(const std::string& id) const
 {
 	auto i = m_id_map.find( id );
@@ -26,10 +26,10 @@
 		return m_data[ (unsigned int)i->second ];
 	}
-	return resource::ptr();
+	return nullptr;
 }
 
-void resource_manager::register_resource_type( const std::string& name, resource_constructor_func c )
+void resource_manager::register_resource_type( const std::string& type_name, resource_constructor_func c )
 {
-	m_constructors[ name ] = c;
+	m_constructors[ type_name ] = c;
 }