Skip to content

Commit

Permalink
Further changes to console text at startup
Browse files Browse the repository at this point in the history
  • Loading branch information
bradharding committed Sep 3, 2023
1 parent 819475c commit 930872b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions src/i_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1052,9 +1052,9 @@ bool I_CreateExternalAutomap(void)
map_rect.h = MAPHEIGHT;

if ((displayname = SDL_GetDisplayName(am_display - 1)))
C_Output("Using \"%s\" (display %i of %i) to show the external automap.", displayname, am_display, numdisplays);
C_Output("\"%s\" (display %i of %i) is being used to show the external automap.", displayname, am_display, numdisplays);
else
C_Output("Using display %i of %i to show the external automap.", am_display, numdisplays);
C_Output("Display %i of %i is being used to show the external automap.", am_display, numdisplays);

return true;
}
Expand Down Expand Up @@ -1228,10 +1228,10 @@ static void SetVideoMode(bool createwindow, bool output)
if (output)
{
if (displayname)
C_Output("Using \"%s\" (display %i of %i)%s.",
C_Output("\"%s\" (display %i of %i) is being used%s.",
displayname, displayindex + 1, numdisplays, (instead ? " instead" : ""));
else
C_Output("Using display %i of %i%s.",
C_Output("Display %i of %i is being used%s.",
displayindex + 1, numdisplays, (instead ? " instead" : ""));
}

Expand Down Expand Up @@ -1570,11 +1570,11 @@ static void SetVideoMode(bool createwindow, bool output)
wadfile_t *playpalwad = lumpinfo[W_CheckNumForName("PLAYPAL")]->wadfile;

if (M_StringCompare(leafname(playpalwad->path), DOOMRETRO_RESOURCEWAD))
C_Output("Using the 256-%s palette from the " BOLD("PLAYPAL") " lump in the IWAD " BOLD("%s") ".",
C_Output("The 256-%s palette from the " BOLD("PLAYPAL") " lump in the IWAD " BOLD("%s") " is being used.",
(english == english_american ? "color" : "colour"),
lumpinfo[W_GetLastNumForName("PLAYPAL")]->wadfile->path);
else
C_Output("Using the 256-%s palette from the " BOLD("PLAYPAL") " lump in the %s " BOLD("%s") ".",
C_Output("The 256-%s palette from the " BOLD("PLAYPAL") " lump in the %s " BOLD("%s") " is being used.",
(english == english_american ? "color" : "colour"),
(playpalwad->type == IWAD ? "IWAD" : "PWAD"),
playpalwad->path);
Expand Down
6 changes: 3 additions & 3 deletions src/r_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -866,17 +866,17 @@ static void R_InitColormaps(void)
dc_colormap[1] = dc_nextcolormap[1] = colormaps[0] = W_CacheLumpName("COLORMAP");

if (numcolormaps == 1)
C_Output("Using the " BOLD("COLORMAP") " lump in the %s " BOLD("%s") ".",
C_Output("The " BOLD("COLORMAP") " lump in the %s " BOLD("%s") " is being used.",
(colormapwad->type == IWAD ? "IWAD" : "PWAD"), colormapwad->path);
else
{
wadfile_t *othercolormapwad = lumpinfo[firstcolormaplump]->wadfile;

if (M_StringCompare(colormapwad->path, othercolormapwad->path))
C_Output("Using the " BOLD("COLORMAP") " lump and %i more in the %s " BOLD("%s") ".",
C_Output("The " BOLD("COLORMAP") " lump and %i more in the %s " BOLD("%s") " are being used.",
numcolormaps - 1, (colormapwad->type == IWAD ? "IWAD" : "PWAD"), colormapwad->path);
else
C_Output("Using the " BOLD("COLORMAP") " lump in the %s " BOLD("%s") " and %i more in the %s " BOLD("%s") ".",
C_Output("The " BOLD("COLORMAP") " lump in the %s " BOLD("%s") " and %i more in the %s " BOLD("%s") " are being used.",
(colormapwad->type == IWAD ? "IWAD" : "PWAD"), colormapwad->path, numcolormaps - 1,
(othercolormapwad->type == IWAD ? "IWAD" : "PWAD"), othercolormapwad->path);
}
Expand Down

0 comments on commit 930872b

Please sign in to comment.