Skip to content

Commit

Permalink
Some tweaks to log levels and output format
Browse files Browse the repository at this point in the history
  • Loading branch information
Ferk committed Oct 19, 2019
1 parent f09c368 commit d80b4c6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
4 changes: 2 additions & 2 deletions libretro/libretro.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions src/d_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
{
Expand All @@ -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)
{
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions src/g_game.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/m_argv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d80b4c6

Please sign in to comment.