Skip to content

Commit

Permalink
Changes to console output at startup
Browse files Browse the repository at this point in the history
  • Loading branch information
bradharding committed Sep 3, 2023
1 parent 2694acd commit 6491d00
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/c_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -2599,10 +2599,10 @@ void C_PrintCompileDate(void)

void C_PrintSDLVersions(void)
{
C_Output("Using v%i.%i.%i of the " ITALICS("SDL (Simple DirectMedia Layer)") " library.",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
C_Output(ITALICS("%s") " uses v%i.%i.%i of the " ITALICS("SDL (Simple DirectMedia Layer)") " library.",
DOOMRETRO_NAME, SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);

C_Output("Also using v%i.%i.%i of the " ITALICS("SDL_mixer")
C_Output("It also uses v%i.%i.%i of the " ITALICS("SDL_mixer")
" library and v%i.%i.%i of the " ITALICS("SDL_image") " library.",
SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL,
SDL_IMAGE_MAJOR_VERSION, SDL_IMAGE_MINOR_VERSION, SDL_IMAGE_PATCHLEVEL);
Expand Down
6 changes: 3 additions & 3 deletions src/d_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1903,14 +1903,14 @@ static void D_DoomMainSetup(void)
I_PrintWindowsVersion();
#endif

I_PrintSystemInfo();
C_PrintSDLVersions();

// Load configuration files before initializing other subsystems.
M_LoadCVARs(configfile);

SDL_Init(SDL_INIT_EVERYTHING);

I_PrintSystemInfo();
C_PrintSDLVersions();

iwadfile = D_FindIWAD();

for (int i = 0; i < MAXALIASES; i++)
Expand Down
6 changes: 3 additions & 3 deletions src/i_system.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ void I_PrintWindowsVersion(void)
}

if (wcslen(info.szCSDVersion) > 0)
C_Output("Running on the %i-bit edition of " ITALICS("Microsoft Windows %s%s%s (%ws)") " (Build %s).",
C_Output("It is running on the %i-bit edition of " ITALICS("Microsoft Windows %s%s%s (%ws)") " (Build %s).",
bits, infoname, (*typename ? " " : ""), typename, info.szCSDVersion, build);
else if (info.dwMajorVersion < 10 || info.dwBuildNumber < 22000)
C_Output("Running on the %i-bit edition of " ITALICS("Microsoft Windows %s%s%s") " (Build %s).",
C_Output("It is running on the %i-bit edition of " ITALICS("Microsoft Windows %s%s%s") " (Build %s).",
bits, infoname, (*typename ? " " : ""), typename, build);
else
C_Output("Running on " ITALICS("Microsoft Windows %s") " (Build %s).", infoname, build);
C_Output("It is running on " ITALICS("Microsoft Windows %s") " (Build %s).", infoname, build);

free(build);
}
Expand Down
6 changes: 3 additions & 3 deletions src/w_wad.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ bool W_AddFile(char *filename, bool autoloaded)
{
autosigil = autoloaded;
C_Output("John Romero's " ITALICS("SIGIL")
" is now available to play by selecting it in the episode menu.");
" can be played by selecting it in the episode menu.");
}
else if (M_StringCompare(file, "SIGIL_SHREDS.WAD")
|| M_StringCompare(file, "SIGIL_SHREDS_COMPAT.wad"))
Expand All @@ -403,11 +403,11 @@ bool W_AddFile(char *filename, bool autoloaded)
}
else if (M_StringCompare(file, "DOOM.WAD"))
C_Output("John Romero's " ITALICS("E1M4B: Phobos Mission Control") " and "
ITALICS("E1M8B: Tech Gone Bad") " are now available to play by entering "
ITALICS("E1M8B: Tech Gone Bad") " can be played by entering "
BOLD("map E1M4B") " or " BOLD("map E1M8B") " in the console.");
else if (M_StringCompare(file, "NERVE.WAD"))
C_Output("Nerve Software's " ITALICS("No Rest For The Living")
" is now available to play by selecting it in the expansion menu.");
" can be played by selecting it in the expansion menu.");
}

if (!resourcewadadded)
Expand Down

0 comments on commit 6491d00

Please sign in to comment.