From 6491d0095967a03f011ec7e6389c574d711f3662 Mon Sep 17 00:00:00 2001 From: Brad Harding Date: Sun, 3 Sep 2023 17:21:11 +1000 Subject: [PATCH] Changes to console output at startup --- src/c_console.c | 6 +++--- src/d_main.c | 6 +++--- src/i_system.c | 6 +++--- src/w_wad.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/c_console.c b/src/c_console.c index be4e749cbd..6a411bc72d 100644 --- a/src/c_console.c +++ b/src/c_console.c @@ -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); diff --git a/src/d_main.c b/src/d_main.c index 34f4d5cac3..0b534395dc 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -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++) diff --git a/src/i_system.c b/src/i_system.c index 59896a834a..fc545f929e 100644 --- a/src/i_system.c +++ b/src/i_system.c @@ -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); } diff --git a/src/w_wad.c b/src/w_wad.c index 5b0fa1171d..c43fd08a0d 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -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")) @@ -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)