From d80b4c6cccde7ff17c0d2965a2f4dd26bbebb5b1 Mon Sep 17 00:00:00 2001
From: Fernando Carmona Varo <ferkiwi@gmail.com>
Date: Sat, 19 Oct 2019 16:12:47 +0200
Subject: [PATCH] Some tweaks to log levels and output format

---
 libretro/libretro.c |  4 ++--
 src/d_main.c        | 10 +++++-----
 src/g_game.c        |  6 ++----
 src/m_argv.c        |  4 ++--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/libretro/libretro.c b/libretro/libretro.c
index d112f313..3edfc1da 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -352,7 +352,7 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
 			break;
 		default:
 			if (log_cb)
-				log_cb(RETRO_LOG_ERROR, "[libretro]: Invalid device, setting type to RETROPAD_CLASSIC ...\n");
+				log_cb(RETRO_LOG_ERROR, "Invalid libretro controller device, using default: RETROPAD_CLASSIC\n");
 			doom_devices[port] = RETROPAD_CLASSIC;
 			environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, gp_classic.desc);
 	}
@@ -1427,7 +1427,7 @@ void R_InitInterpolation(void)
     tic_vars.sample_step = info.timing.sample_rate / tic_vars.fps;
 
     if (log_cb)
-      log_cb(RETRO_LOG_INFO, "[libretro]: Framerate set to %.2f FPS\n", info.timing.fps);
+      log_cb(RETRO_LOG_INFO, "R_InitInterpolation: Framerate set to %.2f FPS\n", info.timing.fps);
   }
   tic_vars.frac = FRACUNIT;
 }
diff --git a/src/d_main.c b/src/d_main.c
index 3cfb2cb1..e5abaeca 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -688,10 +688,10 @@ static char *FindIWADFile(void)
   char  * iwad  = NULL;
 
   i = M_CheckParm("-iwad");
-  lprintf(LO_ALWAYS, "i: %d\n", i);
+  lprintf(LO_DEBUG, "i: %d\n", i);
 
   for(x = 0; x < 32; x++)
-     lprintf(LO_ALWAYS, "myargv[%d]: %s\n", x, myargv[x]);
+     lprintf(LO_DEBUG, "myargv[%d]: %s\n", x, myargv[x]);
 
   if (i && (++i < myargc)) {
     iwad = I_FindFile(myargv[i], NULL);
@@ -732,7 +732,7 @@ static bool IdentifyVersion (void)
   // set save path to -save parm or current dir
 
   strcpy(basesavegame,I_DoomExeDir());
-  lprintf(LO_ALWAYS, "IdentifyVersion: basesavegame: %s\n", basesavegame);
+  lprintf(LO_INFO, "IdentifyVersion: basesavegame: %s\n", basesavegame);
 #ifndef __CELLOS_LV2__
   if ((i=M_CheckParm("-save")) && i<myargc-1) //jff 3/24/98 if -save present
   {
@@ -749,7 +749,7 @@ static bool IdentifyVersion (void)
   // locate the IWAD and determine game mode from it
 
   iwad = FindIWADFile();
-  lprintf(LO_ALWAYS, "iwad: %s\n", iwad);
+  lprintf(LO_INFO, "iwad: %s\n", iwad);
 
   if (iwad && *iwad)
   {
@@ -1157,7 +1157,7 @@ bool D_DoomMainSetup(void)
     }
 
     /* cphipps - the main display. This shows the build date, copyright, and game type */
-    lprintf(LO_ALWAYS,"PrBoom, playing: %s\n"
+    lprintf(LO_INFO,"PrBoom, playing: %s\n"
       "PrBoom is released under the GNU General Public license v2.0.\n"
       "You are welcome to redistribute it under certain conditions.\n"
       "It comes with ABSOLUTELY NO WARRANTY. See the file COPYING for details.\n",
diff --git a/src/g_game.c b/src/g_game.c
index c0c7f947..c955623e 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -544,10 +544,8 @@ static void G_DoLoadLevel (void)
 {
   int i;
 
-  lprintf(LO_ALWAYS,
-          "---------------------------------\n"
-          "G_DoLoadLevel: Episode %d - Map %.2d\n"
-          "---------------------------------\n",
+  lprintf(LO_INFO, "------------------------------\n"
+          "G_DoLoadLevel:  ===== Episode %d - Map %.2d =====\n",
           gameepisode, gamemap);
 
   /* Set the sky map for the episode.
diff --git a/src/m_argv.c b/src/m_argv.c
index 8f3aff32..9eb9a744 100644
--- a/src/m_argv.c
+++ b/src/m_argv.c
@@ -52,8 +52,8 @@ const char * const * myargv; // CPhipps - not sure if ANSI C allows you to
 int M_CheckParm(const char *check)
 {
 #if 0
-  lprintf(LO_ALWAYS, "M_CheckParm: Checking %s...\n", check);
-  lprintf(LO_ALWAYS, "M_CheckParm: myargc: %d, myargc - 1: %d\n", myargc, myargc-1);
+  lprintf(LO_DEBUG, "M_CheckParm: Checking %s...\n", check);
+  lprintf(LO_DEBUG, "M_CheckParm: myargc: %d, myargc - 1: %d\n", myargc, myargc-1);
 #endif
   signed int i = myargc;
   while (--i>0)