X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Flog.qh;h=f33202f939ddaf975aa785b3fdd924372d6e1d11;hb=7e3389f1cf2b461a0f050da3e32dee0b894e2d4c;hp=4b4f7b6bd984945d961277ae148ced8dd864f4ad;hpb=1316f5675cfb765314120ebd5a59a15ff9dac00a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/log.qh b/qcsrc/lib/log.qh
index 4b4f7b6bd..f33202f93 100644
--- a/qcsrc/lib/log.qh
+++ b/qcsrc/lib/log.qh
@@ -6,7 +6,7 @@ void print_assertfailed_severe(string expr);
 void print_assertfailed_fatal(string expr);
 
 #define assert(expr, ...) _assert(print_assertfailed_severe, expr, __VA_ARGS__)
-#define devassert(...) MACRO_BEGIN if (autocvar_developer) assert(__VA_ARGS__); MACRO_END
+#define devassert(...) MACRO_BEGIN if (autocvar_developer > 0) assert(__VA_ARGS__); MACRO_END
 
 #define assert_once(expr, ...) \
 	MACRO_BEGIN \
@@ -17,10 +17,10 @@ void print_assertfailed_fatal(string expr);
 			__once = true; \
 		} \
 	MACRO_END
-#define devassert_once(...) MACRO_BEGIN if (autocvar_developer) assert_once(__VA_ARGS__); MACRO_END
+#define devassert_once(...) MACRO_BEGIN if (autocvar_developer > 0) assert_once(__VA_ARGS__); MACRO_END
 
 #define demand(expr, ...) _assert(print_assertfailed_fatal, expr, __VA_ARGS__)
-#define devdemand(...) MACRO_BEGIN if (autocvar_developer) demand(__VA_ARGS__); MACRO_END
+#define devdemand(...) MACRO_BEGIN if (autocvar_developer > 0) demand(__VA_ARGS__); MACRO_END
 
 #define _assert(f, expr, then) \
 	MACRO_BEGIN \
@@ -43,15 +43,16 @@ string(string, string...) strcat1n = #115;
 // would be nice if __FUNC__ could be concatenated at compile time
 #if 0
 	// less work, bigger binary
-	#define __SOURCELOC__ (sprintf("^7%s^9" "(" "^9"__FILE__"^7"  ":"  "^9"STR(__LINE__)"^7" ")", __FUNC__))
+	#define __SOURCELOC__ (sprintf("^7%s^9(^9"__FILE__"^7:^9"STR(__LINE__)"^7)", __FUNC__))
 #else
-	#define __SOURCELOC__ (sprintf("^7%s^9" "(" "^9%s^7"  ":"  "^9%s^7" ")", __FUNC__, __FILE__, STR(__LINE__)))
+	#define __SOURCELOC__ (sprintf("^7%s^9(^9%s^7:^9%s^7)", __FUNC__, __FILE__, STR(__LINE__)))
 #endif
 
-#define _LOG_HEADER(level) "^9[::" "^7"PROGNAME"^9" "::" level"^9" "] ", __SOURCELOC__
+#define _LOG_HEADER(level) "^9[::^7"PROGNAME"^9::"level"^9] ", __SOURCELOC__
 #define _LOG(f, level, s) \
 	MACRO_BEGIN \
-		f(strcat1n(_LOG_HEADER(level), "\n^7", s, "\n")); \
+		if (autocvar_developer > 0) f(strcat1n(_LOG_HEADER(level), "\n")); \
+		f(strcat1n("^7", s, "\n")); \
 	MACRO_END
 
 #define  LOG_FATAL(...) _LOG_FATAL(strcat1n(__VA_ARGS__))
@@ -70,9 +71,9 @@ string(string, string...) strcat1n = #115;
 #define  LOG_INFOF(...) _LOG_INFO(sprintf(__VA_ARGS__))
 #define _LOG_INFO(s) \
 	MACRO_BEGIN \
-		dprint(_LOG_HEADER("^5INFO")); \
+		if (autocvar_developer > 1) dprint(strcat1n(_LOG_HEADER("^5INFO"), "\n")); \
 		string __s = s; \
-		print("\n^7", __s); \
+		print("^7", __s); \
 		/* TODO: unconditionally add a newline when possible */ \
 		if (str2chr(__s, strlen(__s) - 1) != '\n') { print("\n"); } \
 	MACRO_END
@@ -90,29 +91,32 @@ string(string, string...) strcat1n = #115;
 		if (autocvar_developer > 1) dprint(msg); \
 	MACRO_END
 
+// same as LOG_INFO but without any debug information that bloats console output and compiled program files
+#define  LOG_HELP(...) _LOG_HELP(strcat1n(__VA_ARGS__))
+#define  LOG_HELPF(...) _LOG_HELP(sprintf(__VA_ARGS__))
+#define _LOG_HELP(s) \
+	MACRO_BEGIN \
+		string __s = s; \
+		print("^7", __s, (str2chr(__s, strlen(__s) - 1) != '\n') ? "\n" : ""); \
+	MACRO_END
+
 // TODO: this sucks, lets find a better way to do backtraces?
 #define _backtrace() builtin_remove(NULL)
 
 noref int autocvar_developer;
 noref bool autocvar_prvm_backtraceforwarnings;
 
-#ifdef SVQC
-#define bt_cvar_set(cvar, value) builtin_cvar_set(cvar, value)
-#else
-#define bt_cvar_set(cvar, value) cvar_set(cvar, value)
-#endif
-
 #define backtrace(msg) \
 	MACRO_BEGIN \
 		int dev = autocvar_developer; \
 		bool war = autocvar_prvm_backtraceforwarnings; \
-		bt_cvar_set("developer", "1"); \
-		bt_cvar_set("prvm_backtraceforwarnings", "1"); \
+		cvar_set("developer", "1"); \
+		cvar_set("prvm_backtraceforwarnings", "1"); \
 		print("\n--- CUT HERE ---\n", msg); \
 		_backtrace(); \
 		print("\n--- CUT UNTIL HERE ---\n"); \
-		bt_cvar_set("developer", ftos(dev)); \
-		bt_cvar_set("prvm_backtraceforwarnings", ftos(war)); \
+		cvar_set("developer", ftos(dev)); \
+		cvar_set("prvm_backtraceforwarnings", ftos(war)); \
 	MACRO_END
 
 void print_assertfailed_severe(string expr)