#if defined(MENUQC)
-string(string...) strcat0n = #53;
+string(string, string...) strcat1n = #53;
#else
-string(string...) strcat0n = #115;
+string(string, string...) strcat1n = #115;
#endif
+// would be nice if __FUNC__ could be concatenated at compile time
#define __SOURCELOC__ (sprintf("^7%s^9" "(" "^9"__FILE__"^7" ":" "^9"STR(__LINE__)"^7" ")", __FUNC__))
+#define _LOG_HEADER(level) "^9[::" "^7"PROGNAME"^9" "::" level"^9" "] ", __SOURCELOC__
#define _LOG(f, level, s) \
MACRO_BEGIN { \
- f(sprintf("^9[::" "^7"PROGNAME"^9" "::" level"^9" "] %s\n^7%s\n", __SOURCELOC__, s)); \
+ f(strcat1n(_LOG_HEADER(level), "\n^7", s, "\n")); \
} MACRO_END
-#define LOG_FATAL(...) _LOG_FATAL(strcat0n(__VA_ARGS__))
+#define LOG_FATAL(...) _LOG_FATAL(strcat1n(__VA_ARGS__))
#define LOG_FATALF(...) _LOG_FATAL(sprintf(__VA_ARGS__))
#define _LOG_FATAL(s) _LOG(error, "^1FATAL", s)
-#define LOG_SEVERE(...) _LOG_SEVERE(strcat0n(__VA_ARGS__))
+#define LOG_SEVERE(...) _LOG_SEVERE(strcat1n(__VA_ARGS__))
#define LOG_SEVEREF(...) _LOG_SEVERE(sprintf(__VA_ARGS__))
#define _LOG_SEVERE(s) _LOG(backtrace, "^1SEVERE", s)
-#define LOG_WARN(...) _LOG_WARN(strcat0n(__VA_ARGS__))
+#define LOG_WARN(...) _LOG_WARN(strcat1n(__VA_ARGS__))
#define LOG_WARNF(...) _LOG_WARN(sprintf(__VA_ARGS__))
#define _LOG_WARN(s) _LOG(print, "^3WARNING", s)
-#define LOG_INFO(...) _LOG_INFO(strcat0n(__VA_ARGS__))
+#define LOG_INFO(...) _LOG_INFO(strcat1n(__VA_ARGS__))
#define LOG_INFOF(...) _LOG_INFO(sprintf(__VA_ARGS__))
#define _LOG_INFO(s) \
MACRO_BEGIN { \
- string ___s = s; \
- if (autocvar_developer) \
- _LOG(print, "^5INFO", ___s); \
- else \
- print(___s); \
+ dprint(_LOG_HEADER("^5INFO")); \
+ print("\n^7", s); \
} MACRO_END
-#define LOG_TRACE(...) _LOG_TRACE(strcat0n(__VA_ARGS__))
+#define LOG_TRACE(...) _LOG_TRACE(strcat1n(__VA_ARGS__))
#define LOG_TRACEF(...) _LOG_TRACE(sprintf(__VA_ARGS__))
#define _LOG_TRACE(s) _LOG(dprint, "^6TRACE", s)
-#define LOG_DEBUG(...) _LOG_DEBUG(strcat0n(__VA_ARGS__))
+#define LOG_DEBUG(...) _LOG_DEBUG(strcat1n(__VA_ARGS__))
#define LOG_DEBUGF(...) _LOG_DEBUG(sprintf(__VA_ARGS__))
#define _LOG_DEBUG(s) _LOG(dprint2, "^2DEBUG", s)