From d5dcf3a772ccf0320c4436af2abaa5b3fc6048c4 Mon Sep 17 00:00:00 2001 From: Yamagi Date: Thu, 8 Oct 2020 12:38:29 +0200 Subject: [PATCH] Fix several inconsistencies and typos in console output. --- src/backends/unix/system.c | 6 +++--- src/backends/windows/system.c | 4 ++-- src/client/curl/qcurl.c | 4 ++-- src/client/input/sdl.c | 4 ++-- src/client/refresh/gl1/gl1_main.c | 4 ++-- src/client/refresh/gl3/gl3_main.c | 8 ++++---- src/client/refresh/soft/sw_main.c | 16 ++++++++-------- src/client/refresh/soft/sw_surf.c | 2 +- src/client/sound/qal.c | 4 ++-- src/client/vid/glimp_sdl.c | 7 ++++--- src/client/vid/vid.c | 6 +++--- src/common/cmdparser.c | 2 +- 12 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/backends/unix/system.c b/src/backends/unix/system.c index b2d7c992..c4bd90f4 100644 --- a/src/backends/unix/system.c +++ b/src/backends/unix/system.c @@ -361,7 +361,7 @@ Sys_GetGameAPI(void *parms) Com_Error(ERR_FATAL, "Sys_GetGameAPI without Sys_UnloadingGame"); } - Com_Printf("LoadLibrary(\"%s\")\n", gamename); + Com_Printf("Loading library: %s\n", gamename); /* now run through the search paths */ path = NULL; @@ -393,12 +393,12 @@ Sys_GetGameAPI(void *parms) if (game_library) { - Com_MDPrintf("LoadLibrary (%s)\n", name); + Com_MDPrintf("Loading library: %s\n", name); break; } else { - Com_Printf("LoadLibrary (%s):", name); + Com_Printf("Loading library: %s\n: ", name); path = (char *)dlerror(); str_p = strchr(path, ':'); /* skip the path (already shown) */ diff --git a/src/backends/windows/system.c b/src/backends/windows/system.c index 96c9c720..861b99e1 100755 --- a/src/backends/windows/system.c +++ b/src/backends/windows/system.c @@ -424,7 +424,7 @@ Sys_GetGameAPI(void *parms) if (game_library) { - Com_DPrintf("LoadLibrary (%s)\n", name); + Com_DPrintf("Loading library: %s\n", name); break; } @@ -435,7 +435,7 @@ Sys_GetGameAPI(void *parms) if (game_library) { - Com_DPrintf("LoadLibrary (%s)\n", name); + Com_DPrintf("Loading library: %s\n", name); break; } } diff --git a/src/client/curl/qcurl.c b/src/client/curl/qcurl.c index 103f6039..d122f2c8 100644 --- a/src/client/curl/qcurl.c +++ b/src/client/curl/qcurl.c @@ -101,7 +101,7 @@ qboolean qcurlInit(void) // Mkay, let's try to find a working libcurl. cl_libcurl = Cvar_Get("cl_libcurl", (char *)libcurl[0], CVAR_ARCHIVE); - Com_Printf("LoadLibrary(%s)\n", cl_libcurl->string); + Com_Printf("Loading library: %s\n", cl_libcurl->string); Sys_LoadLibrary(cl_libcurl->string, NULL, &curlhandle); if (!curlhandle) @@ -116,7 +116,7 @@ qboolean qcurlInit(void) continue; } - Com_Printf("LoadLibrary(%s)\n", libcurl[i]); + Com_Printf("Loading library: %s\n", libcurl[i]); Sys_LoadLibrary(libcurl[i], NULL, &curlhandle); if (!curlhandle) diff --git a/src/client/input/sdl.c b/src/client/input/sdl.c index 9e767960..051505b9 100644 --- a/src/client/input/sdl.c +++ b/src/client/input/sdl.c @@ -1398,7 +1398,7 @@ IN_Init(void) if (joystick_haptic == NULL) { - Com_Printf("Most likely joystick isn't haptic\n"); + Com_Printf("Most likely joystick isn't haptic.\n"); } else { @@ -1457,7 +1457,7 @@ IN_Init(void) if (joystick_haptic == NULL) { - Com_Printf("Most likely mouse isn't haptic\n"); + Com_Printf("Most likely mouse isn't haptic.\n"); } else { diff --git a/src/client/refresh/gl1/gl1_main.c b/src/client/refresh/gl1/gl1_main.c index 2f14fed8..8bf3b5bd 100644 --- a/src/client/refresh/gl1/gl1_main.c +++ b/src/client/refresh/gl1/gl1_main.c @@ -1283,7 +1283,7 @@ R_Register(void) static int SetMode_impl(int *pwidth, int *pheight, int mode, int fullscreen) { - R_Printf(PRINT_ALL, "setting mode %d:", mode); + R_Printf(PRINT_ALL, "Setting mode %d:", mode); /* mode -1 is not in the vid mode table - so we keep the values in pwidth and pheight and don't even try to look up the mode info */ @@ -1303,7 +1303,7 @@ SetMode_impl(int *pwidth, int *pheight, int mode, int fullscreen) } } - R_Printf(PRINT_ALL, " %d %d\n", *pwidth, *pheight); + R_Printf(PRINT_ALL, " %dx%d (vid_fullscreen %i)\n", *pwidth, *pheight, fullscreen); if (!ri.GLimp_InitGraphics(fullscreen, pwidth, pheight)) { diff --git a/src/client/refresh/gl3/gl3_main.c b/src/client/refresh/gl3/gl3_main.c index 54d811cc..cbe97652 100644 --- a/src/client/refresh/gl3/gl3_main.c +++ b/src/client/refresh/gl3/gl3_main.c @@ -332,7 +332,7 @@ enum static int SetMode_impl(int *pwidth, int *pheight, int mode, int fullscreen) { - R_Printf(PRINT_ALL, "setting mode %d:", mode); + R_Printf(PRINT_ALL, "Setting mode %d:", mode); /* mode -1 is not in the vid mode table - so we keep the values in pwidth and pheight and don't even try to look up the mode info */ @@ -352,7 +352,7 @@ SetMode_impl(int *pwidth, int *pheight, int mode, int fullscreen) } } - R_Printf(PRINT_ALL, " %d %d\n", *pwidth, *pheight); + R_Printf(PRINT_ALL, " %dx%d (vid_fullscreen %i)\n", *pwidth, *pheight, fullscreen); if (!ri.GLimp_InitGraphics(fullscreen, pwidth, pheight)) @@ -572,11 +572,11 @@ GL3_Init(void) if(GL3_InitShaders()) { - R_Printf(PRINT_ALL, "Loading shaders succeeded!\n"); + R_Printf(PRINT_ALL, "Loading shaders succeeded.\n"); } else { - R_Printf(PRINT_ALL, "Loading shaders failed!\n"); + R_Printf(PRINT_ALL, "Loading shaders failed.\n"); return false; } diff --git a/src/client/refresh/soft/sw_main.c b/src/client/refresh/soft/sw_main.c index 0bfa0acf..83a9ae2c 100644 --- a/src/client/refresh/soft/sw_main.c +++ b/src/client/refresh/soft/sw_main.c @@ -573,7 +573,7 @@ R_ReallocateMapBuffers (void) surface_p = &surfaces[2]; // background is surface 1, // surface 0 is a dummy - R_Printf(PRINT_ALL, "Allocated %d surfaces\n", r_cnumsurfs); + R_Printf(PRINT_ALL, "Allocated %d surfaces.\n", r_cnumsurfs); } if (!r_numallocatedlights || r_outoflights) @@ -603,7 +603,7 @@ R_ReallocateMapBuffers (void) // set limits blocklight_max = &blocklights[r_numallocatedlights]; - R_Printf(PRINT_ALL, "Allocated %d lights\n", r_numallocatedlights); + R_Printf(PRINT_ALL, "Allocated %d lights.\n", r_numallocatedlights); } if (!r_numallocatededges || r_outofedges) @@ -634,7 +634,7 @@ R_ReallocateMapBuffers (void) edge_max = &r_edges[r_numallocatededges]; edge_p = r_edges; - R_Printf(PRINT_ALL, "Allocated %d edges\n", r_numallocatededges); + R_Printf(PRINT_ALL, "Allocated %d edges.\n", r_numallocatededges); } if (!r_numallocatedverts || r_outofverts) @@ -662,7 +662,7 @@ R_ReallocateMapBuffers (void) } finalverts_max = &finalverts[r_numallocatedverts]; - R_Printf(PRINT_ALL, "Allocated %d verts\n", r_numallocatedverts); + R_Printf(PRINT_ALL, "Allocated %d verts.\n", r_numallocatedverts); } if (!r_numallocatedtriangles || r_outoftriangles) @@ -690,7 +690,7 @@ R_ReallocateMapBuffers (void) } triangles_max = &triangle_spans[r_numallocatedtriangles]; - R_Printf(PRINT_ALL, "Allocated %d triangles\n", r_numallocatedtriangles); + R_Printf(PRINT_ALL, "Allocated %d triangles.\n", r_numallocatedtriangles); } if (!r_numallocatededgebasespans || r_outedgebasespans) @@ -719,7 +719,7 @@ R_ReallocateMapBuffers (void) } max_span_p = &edge_basespans[r_numallocatededgebasespans]; - R_Printf(PRINT_ALL, "Allocated %d edgespans\n", r_numallocatededgebasespans); + R_Printf(PRINT_ALL, "Allocated %d edgespans.\n", r_numallocatededgebasespans); } } @@ -2227,7 +2227,7 @@ SWimp_SetMode(int *pwidth, int *pheight, int mode, int fullscreen ) { rserr_t retval = rserr_ok; - R_Printf (PRINT_ALL, "setting mode %d:", mode ); + R_Printf (PRINT_ALL, "Setting mode %d:", mode ); if ((mode >= 0) && !ri.Vid_GetModeInfo( pwidth, pheight, mode ) ) { @@ -2245,7 +2245,7 @@ SWimp_SetMode(int *pwidth, int *pheight, int mode, int fullscreen ) } } - R_Printf(PRINT_ALL, " %d %d\n", *pwidth, *pheight); + R_Printf(PRINT_ALL, " %dx%d (vid_fullscreen %i)\n", *pwidth, *pheight, fullscreen); if (!ri.GLimp_InitGraphics(fullscreen, pwidth, pheight)) { diff --git a/src/client/refresh/soft/sw_surf.c b/src/client/refresh/soft/sw_surf.c index ed212302..ce62bfbf 100644 --- a/src/client/refresh/soft/sw_surf.c +++ b/src/client/refresh/soft/sw_surf.c @@ -230,7 +230,7 @@ R_InitCaches (void) // round up to page size size = (size + 8191) & ~8191; - R_Printf(PRINT_ALL,"%ik surface cache\n", size/1024); + R_Printf(PRINT_ALL,"%ik surface cache.\n", size/1024); sc_size = size; sc_base = (surfcache_t *)malloc(size); diff --git a/src/client/sound/qal.c b/src/client/sound/qal.c index 4c37dcad..914aa50b 100644 --- a/src/client/sound/qal.c +++ b/src/client/sound/qal.c @@ -398,7 +398,7 @@ QAL_Init() /* DEFAULT_OPENAL_DRIVER is defined at compile time via the compiler */ al_driver = Cvar_Get("al_driver", DEFAULT_OPENAL_DRIVER, CVAR_ARCHIVE); - Com_Printf("LoadLibrary(%s)\n", al_driver->string); + Com_Printf("Loading library: %s\n", al_driver->string); /* Load the library */ Sys_LoadLibrary(al_driver->string, NULL, &handle); @@ -510,7 +510,7 @@ QAL_Init() qalDistanceModel = ALSYMBOL(handle, alDistanceModel); /* Open the OpenAL device */ - Com_Printf("...opening OpenAL device:"); + Com_Printf("...opening OpenAL device: "); device = qalcOpenDevice(al_device->string[0] ? al_device->string : NULL); diff --git a/src/client/vid/glimp_sdl.c b/src/client/vid/glimp_sdl.c index bef48054..e7c37584 100755 --- a/src/client/vid/glimp_sdl.c +++ b/src/client/vid/glimp_sdl.c @@ -405,15 +405,17 @@ GLimp_Init(void) SDL_version version; SDL_GetVersion(&version); + Com_Printf("-------- vid initialization --------\n"); Com_Printf("SDL version is: %i.%i.%i\n", (int)version.major, (int)version.minor, (int)version.patch); Com_Printf("SDL video driver is \"%s\".\n", SDL_GetCurrentVideoDriver()); num_displays = SDL_GetNumVideoDisplays(); InitDisplayIndices(); ClampDisplayIndexCvar(); - Com_Printf("SDL didplay modes:\n"); + Com_Printf("SDL display modes:\n"); PrintDisplayModes(); + Com_Printf("------------------------------------\n\n"); } return true; @@ -583,8 +585,7 @@ GLimp_InitGraphics(int fullscreen, int *pwidth, int *pheight) } else { - Com_Printf("Real display mode: %ix%i@%i (vid_fullscreen: %i)\n", mode.w, mode.h, - mode.refresh_rate, fullscreen); + Com_Printf("Real display mode: %ix%i@%i\n", mode.w, mode.h, mode.refresh_rate); } diff --git a/src/client/vid/vid.c b/src/client/vid/vid.c index 06a6588b..9056f074 100644 --- a/src/client/vid/vid.c +++ b/src/client/vid/vid.c @@ -358,7 +358,7 @@ VID_LoadRenderer(void) snprintf(reflib_name, sizeof(reflib_name), "ref_%s.%s", vid_renderer->string, lib_ext); snprintf(reflib_path, sizeof(reflib_path), "%s%s", Sys_GetBinaryDir(), reflib_name); - Com_Printf("LoadLibrary(%s)\n", reflib_name); + Com_Printf("Loading library: %s\n", reflib_name); // Mkay, let's load the requested renderer. GetRefAPI = Sys_LoadLibrary(reflib_path, "GetRefAPI", &reflib_handle); @@ -414,7 +414,7 @@ VID_LoadRenderer(void) { VID_ShutdownRenderer(); - Com_Printf("ERROR: Loading %s as rendering backend failed!\n", reflib_name); + Com_Printf("ERROR: Loading %s as rendering backend failed.\n", reflib_name); Com_Printf("------------------------------------\n\n"); return false; @@ -423,7 +423,7 @@ VID_LoadRenderer(void) /* Ensure that all key states are cleared */ Key_MarkAllUp(); - Com_Printf("Successfully loaded %s as rendering backend\n", reflib_name); + Com_Printf("Successfully loaded %s as rendering backend.\n", reflib_name); Com_Printf("------------------------------------\n\n"); return true; diff --git a/src/common/cmdparser.c b/src/common/cmdparser.c index d772b258..7576e304 100644 --- a/src/common/cmdparser.c +++ b/src/common/cmdparser.c @@ -389,7 +389,7 @@ Cmd_Exec_f(void) return; } - Com_Printf("execing %s\n", Cmd_Argv(1)); + Com_Printf("execing %s.\n", Cmd_Argv(1)); /* the file doesn't have a trailing 0, so we need to copy it off */ /* we also add a newline */