projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a99a180
)
moved checks for debug mode to main logging function
author
Holger Schemel
<info@artsoft.org>
Thu, 17 Sep 2020 18:10:16 +0000
(20:10 +0200)
committer
Holger Schemel
<info@artsoft.org>
Thu, 17 Sep 2020 18:10:16 +0000
(20:10 +0200)
src/libgame/misc.c
patch
|
blob
|
history
diff --git
a/src/libgame/misc.c
b/src/libgame/misc.c
index c5067fb9b8e78a3aa0e1e162b4a284d536f21e61..7b9beacc51ff555ce81431a5da94817037b331bd 100644
(file)
--- a/
src/libgame/misc.c
+++ b/
src/libgame/misc.c
@@
-293,6
+293,17
@@
static void Log(int log_level, char *mode, char *format, va_list ap)
if (log_level < 0 || log_level > LOG_FATAL)
return;
if (log_level < 0 || log_level > LOG_FATAL)
return;
+ if (log_level == LOG_DEBUG)
+ {
+ if (!options.debug)
+ return;
+
+ // if optional debug mode specified, limit debug output accordingly
+ if (options.debug_mode != NULL &&
+ !strEqual(options.debug_mode, mode))
+ return;
+ }
+
#if defined(PLATFORM_ANDROID)
android_log_prio = (log_level == LOG_DEBUG ? ANDROID_LOG_DEBUG :
log_level == LOG_INFO ? ANDROID_LOG_INFO :
#if defined(PLATFORM_ANDROID)
android_log_prio = (log_level == LOG_DEBUG ? ANDROID_LOG_DEBUG :
log_level == LOG_INFO ? ANDROID_LOG_INFO :
@@
-340,14
+351,6
@@
void Debug(char *mode, char *format, ...)
{
va_list ap;
{
va_list ap;
- if (!options.debug)
- return;
-
- // if optional debug mode specified, limit debug output accordingly
- if (options.debug_mode != NULL &&
- !strEqual(options.debug_mode, mode))
- return;
-
va_start(ap, format);
Log(LOG_DEBUG, mode, format, ap);
va_end(ap);
va_start(ap, format);
Log(LOG_DEBUG, mode, format, ap);
va_end(ap);