Merge branch 'master' into Mario/hagar_notfixed

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / log.qh

diff --git a/qcsrc/lib/log.qh b/qcsrc/lib/log.qh
index 01dc645f5630e131ae77f857bba0087c9137a85d..02a25cdad0d0679d577c00191a9835e4750f5084 100644 (file)
--- a/qcsrc/lib/log.qh
+++ b/qcsrc/lib/log.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "progname.qh"
+
 #define assert(expr, ...) _assert(LOG_SEVERE, expr, __VA_ARGS__)
 #define devassert(...) MACRO_BEGIN if (autocvar_developer) assert(__VA_ARGS__); MACRO_END
 
@@ -36,9 +38,11 @@ string(string...) strcat0n = #53;
 string(string...) strcat0n = #115;
 #endif
 
+#define __SOURCELOC__ (sprintf("^9"__FILE__"^7"  ":"  "^9%s^7"  ":"  "^9"STR(__LINE__)"^7", __FUNC__))
+
 #define _LOG(f, level, s) \
        MACRO_BEGIN { \
-               f(sprintf("^9[::" level "^9] [" __FILE__ "^7:^9%s^7:^9" STR(__LINE__) "] \n^7%s\n", __FUNC__, s)); \
+               f(sprintf("^9[::^7" PROGNAME "^9::" level "^9] [%s^9]\n^7%s\n", __SOURCELOC__, s)); \
        } MACRO_END
 
 #define  LOG_FATAL(...) _LOG_FATAL(strcat0n(__VA_ARGS__))