Index: trunk/src/engine/particle_engine.cc
===================================================================
--- trunk/src/engine/particle_engine.cc	(revision 364)
+++ trunk/src/engine/particle_engine.cc	(revision 365)
@@ -303,5 +303,5 @@
 	if ( id == "" )
 	{
-		NV_LOG( LOG_ERROR, "Bad table passed to particle_engine!" )
+		NV_LOG_ERROR( "Bad table passed to particle_engine!" )
 	}
 	// TODO : overwrite check
@@ -325,5 +325,5 @@
 	else 
 	{
-		NV_LOG( LOG_ERROR, "Unknown orientation type! (" << orientation << ")!" );
+		NV_LOG_ERROR( "Unknown orientation type! (", orientation, ")!" );
 		data.orientation = particle_orientation::POINT;
 	}
@@ -341,5 +341,5 @@
 	else 
 	{
-		NV_LOG( LOG_ERROR, "Unknown particle origin! (" << origin << ")!" );
+		NV_LOG_ERROR( "Unknown particle origin! (", origin, ")!" );
 		data.origin = particle_origin::CENTER;
 	}
@@ -368,5 +368,5 @@
 				{
 					edata.emmiter_func = nv_particle_emmiter_point;
-					NV_LOG( LOG_WARNING, "Unknown emmiter type in particle system! (" << sub_type << ")" );
+					NV_LOG_WARNING( "Unknown emmiter type in particle system! (", sub_type, ")" );
 				}
 
@@ -417,5 +417,5 @@
 			else
 			{
-				NV_LOG( LOG_ERROR, "Too many emmiters (" << MAX_PARTICLE_EMMITERS << " is MAX)!" );
+				NV_LOG_ERROR( "Too many emmiters (", MAX_PARTICLE_EMMITERS, " is MAX)!" );
 			}
 		}
@@ -433,5 +433,5 @@
 					{
 						data.affector_count--;
-						NV_LOG( LOG_WARNING, "Bad data passed to " << sub_type << " affector in particle system!" );
+						NV_LOG_WARNING( "Bad data passed to ", sub_type, " affector in particle system!" );
 					}
 				}
@@ -439,15 +439,15 @@
 				{
 					data.affector_count--;
-					NV_LOG( LOG_WARNING, "Unknown affector type in particle system! (" << sub_type << ")" );
+					NV_LOG_WARNING( "Unknown affector type in particle system! (", sub_type, ")" );
 				}
 			}
 			else
 			{
-				NV_LOG( LOG_ERROR, "Too many affectors (" << MAX_PARTICLE_AFFECTORS << " is MAX)!" );
+				NV_LOG_ERROR( "Too many affectors (", MAX_PARTICLE_AFFECTORS, " is MAX)!" );
 			}
 		}
 		else 
 		{
-			NV_LOG( LOG_WARNING, "Unknown element in particle system! (" << type << ")" );
+			NV_LOG_WARNING( "Unknown element in particle system! (", type, ")" );
 		}
 	}
Index: trunk/src/engine/program_manager.cc
===================================================================
--- trunk/src/engine/program_manager.cc	(revision 364)
+++ trunk/src/engine/program_manager.cc	(revision 365)
@@ -7,5 +7,7 @@
 #include "nv/engine/program_manager.hh"
 #include "nv/core/range.hh"
+#include "nv/core/logging.hh"
 #include "nv/lua/lua_nova.hh"
+
 
 nv::program_manager::program_manager( context* a_context ) : m_context( a_context )
@@ -17,5 +19,5 @@
 nv::resource_id nv::program_manager::load_resource( lua::table_guard& table )
 {
-	NV_LOG( LOG_DEBUG, table.get_string("id") );
+	NV_LOG_DEBUG( table.get_string("id") );
 	std::string vsource;
 	std::string fsource;