renamed function

[rocksndiamonds.git] / src / libgame / misc.c

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index c5067fb9b8e78a3aa0e1e162b4a284d536f21e61..b71fee31934da47516917d3dbdb9e99aee3fdd49 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -288,11 +288,22 @@ static void printf_log_prefix(int log_level, char *mode)
     printf_log_nonewline("[%s] ", log_token);
 }
 
-static void Log(int log_level, char *mode, char *format, va_list ap)
+static void vLog(int log_level, char *mode, char *format, va_list ap)
 {
   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 &&
+       strstr(mode, options.debug_mode) == NULL)
+      return;
+  }
+
 #if defined(PLATFORM_ANDROID)
   android_log_prio = (log_level == LOG_DEBUG ? ANDROID_LOG_DEBUG :
                      log_level == LOG_INFO  ? ANDROID_LOG_INFO :
@@ -340,16 +351,8 @@ void Debug(char *mode, char *format, ...)
 {
   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);
+  vLog(LOG_DEBUG, mode, format, ap);
   va_end(ap);
 }
 
@@ -358,7 +361,7 @@ void Info(char *format, ...)
   va_list ap;
 
   va_start(ap, format);
-  Log(LOG_INFO, NULL, format, ap);
+  vLog(LOG_INFO, NULL, format, ap);
   va_end(ap);
 }
 
@@ -367,7 +370,7 @@ void Warn(char *format, ...)
   va_list ap;
 
   va_start(ap, format);
-  Log(LOG_WARN, NULL, format, ap);
+  vLog(LOG_WARN, NULL, format, ap);
   va_end(ap);
 }