X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FLog.hh;h=d3aa555aac4c5fa4b81076de90a595612ca28883;hp=263ede8fdff0d950743139b39a5f2159c166728b;hb=71bd9dbaf1c1e3c55a9f63392a73865d8aeee7d4;hpb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa

diff --git a/src/Moof/Log.hh b/src/Moof/Log.hh
index 263ede8..d3aa555 100644
--- a/src/Moof/Log.hh
+++ b/src/Moof/Log.hh
@@ -44,11 +44,13 @@
  * @param X test to perform
  */
 
-#if ! NDEBUG
+#undef ASSERT
+
+#if NDEBUG
+#define ASSERT(X)
+#else
 #define ASSERT(X) if (!(X)) Mf::logError("false assertion at %s:%d, " #X, \
 		__FILE__, __LINE__), exit(1)
-#else
-#define ASSERT(X)
 #endif
 
 
@@ -66,8 +68,9 @@ enum LogLevel
 	LOG_NONE		= -1,		///< Disable all logging.
 	LOG_ERROR		=  1,		///< Log only errors.
 	LOG_WARNING		=  2,		///< Log warnings and errors.
-	LOG_INFO		=  3,		///< Log info, warnings, errors.
-	LOG_DEBUG		=  4		///< Log all messages.
+	LOG_SCRIPT		=  3,		///< Log messages from Lua, too.
+	LOG_INFO		=  4,		///< Log info, warnings, errors.
+	LOG_DEBUG		=  5,		///< Log all messages.
 };
 
 
@@ -113,6 +116,11 @@ void logInfo(const char* fmt, ...);
 
 void logDebug(const char* fmt, ...);
 
+void logScript(const char* fmt, ...);
+class Script;
+int logScript(Script& script);
+void importLogPrintFunction(Script& script);
+
 
 } // namespace Mf