--- deliantra/server/common/logger.C	2007/01/15 21:06:18	1.11
+++ deliantra/server/common/logger.C	2007/04/27 19:53:05	1.12
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -22,44 +22,41 @@
  * The authors can be reached via e-mail at <crossfire@schmorp.de>
  */
 
-#include <stdarg.h>
+#include <cstdarg>
 #include <global.h>
 #include <funcpoint.h>
 
-/*
- * Logs a message to stderr, or to file, and/or even to socket.
- * Or discards the message if it is of no importanse, and none have
- * asked to hear messages of that logLevel.
- *
- * See include/logger.h for possible logLevels.  Messages with llevInfo
- * and llevError are always printed, regardless of debug mode.
- */
-
 void
-LOG (LogLevel logLevel, const char *format, ...)
+LOG (int flags, const char *format, ...)
 {
-  if (logLevel <= settings.debug)
-    {
-      char msec[20];
-      char buf[20460];
-      char tbuf[20480];
-
-      struct timeval tv;
-      gettimeofday (&tv, 0);
-      struct tm *ptime = localtime (&tv.tv_sec);
-
-      strftime (tbuf, sizeof (tbuf), "%Y-%m-%d %H:%M:%S", ptime);
-      sprintf (msec, ".%03d ", (int)(tv.tv_usec / 1000));
-
-      va_list ap;
-      va_start (ap, format);
-      vsnprintf (buf, sizeof (buf), format, ap);
-      va_end (ap);
-
-      strncat (tbuf, msec, sizeof (tbuf));
-      strncat (tbuf, buf, sizeof (tbuf));
-
-      fputs (tbuf, logfile);
-      fputs (tbuf, stderr);
-    }
+  int level = flags & 15;
+
+  if (level > settings.debug)
+    return;
+
+  char msec[20];
+  char buf[20460];
+  char tbuf[20480];
+
+  struct timeval tv;
+  gettimeofday (&tv, 0);
+  struct tm *ptime = localtime (&tv.tv_sec);
+
+  strftime (tbuf, sizeof (tbuf), "%Y-%m-%d %H:%M:%S", ptime);
+  sprintf (msec, ".%03d ", (int)(tv.tv_usec / 1000));
+
+  va_list ap;
+  va_start (ap, format);
+  vsnprintf (buf, sizeof (buf), format, ap);
+  va_end (ap);
+
+  strncat (tbuf, msec, sizeof (tbuf));
+  strncat (tbuf, buf, sizeof (tbuf));
+
+  fputs (tbuf, logfile);
+  if (logfile != stderr)
+    fputs (tbuf, stderr);
+
+  if (flags & logBacktrace)
+    log_backtrace (tbuf);
 }