Convert a couple of strings with escaped characters to raw string literals

git-svn-id: https://svn.eduke32.com/eduke32@7068 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-16 06:08:36 +00:00
parent 4b89c095e2
commit dcb0f9d8bb
2 changed files with 8 additions and 8 deletions

View file

@ -833,14 +833,14 @@ void G_AddSearchPaths(void)
// Duke Nukem 3D: 20th Anniversary World Tour (Steam) // Duke Nukem 3D: 20th Anniversary World Tour (Steam)
bufsize = sizeof(buf); bufsize = sizeof(buf);
if (G_ReadRegistryValue("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 434050", "InstallLocation", buf, &bufsize)) if (G_ReadRegistryValue(R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 434050)", "InstallLocation", buf, &bufsize))
{ {
addsearchpath_user(buf, SEARCHPATH_REMOVE); addsearchpath_user(buf, SEARCHPATH_REMOVE);
} }
// Duke Nukem 3D: Megaton Edition (Steam) // Duke Nukem 3D: Megaton Edition (Steam)
bufsize = sizeof(buf); bufsize = sizeof(buf);
if (G_ReadRegistryValue("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 225140", "InstallLocation", buf, &bufsize)) if (G_ReadRegistryValue(R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 225140)", "InstallLocation", buf, &bufsize))
{ {
char * const suffix = buf + bufsize - 1; char * const suffix = buf + bufsize - 1;
DWORD const remaining = sizeof(buf) - bufsize; DWORD const remaining = sizeof(buf) - bufsize;
@ -857,7 +857,7 @@ void G_AddSearchPaths(void)
// Duke Nukem 3D (3D Realms Anthology (Steam) / Kill-A-Ton Collection 2015) // Duke Nukem 3D (3D Realms Anthology (Steam) / Kill-A-Ton Collection 2015)
bufsize = sizeof(buf); bufsize = sizeof(buf);
if (G_ReadRegistryValue("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 359850", "InstallLocation", buf, &bufsize)) if (G_ReadRegistryValue(R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 359850)", "InstallLocation", buf, &bufsize))
{ {
char * const suffix = buf + bufsize - 1; char * const suffix = buf + bufsize - 1;
DWORD const remaining = sizeof(buf) - bufsize; DWORD const remaining = sizeof(buf) - bufsize;
@ -897,7 +897,7 @@ void G_AddSearchPaths(void)
// NAM (Steam) // NAM (Steam)
bufsize = sizeof(buf); bufsize = sizeof(buf);
if (G_ReadRegistryValue("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 329650", "InstallLocation", buf, &bufsize)) if (G_ReadRegistryValue(R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 329650)", "InstallLocation", buf, &bufsize))
{ {
char * const suffix = buf + bufsize - 1; char * const suffix = buf + bufsize - 1;
DWORD const remaining = sizeof(buf) - bufsize; DWORD const remaining = sizeof(buf) - bufsize;
@ -908,7 +908,7 @@ void G_AddSearchPaths(void)
// WWII GI (Steam) // WWII GI (Steam)
bufsize = sizeof(buf); bufsize = sizeof(buf);
if (G_ReadRegistryValue("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 376750", "InstallLocation", buf, &bufsize)) if (G_ReadRegistryValue(R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 376750)", "InstallLocation", buf, &bufsize))
{ {
char * const suffix = buf + bufsize - 1; char * const suffix = buf + bufsize - 1;
DWORD const remaining = sizeof(buf) - bufsize; DWORD const remaining = sizeof(buf) - bufsize;

View file

@ -743,8 +743,8 @@ static int32_t osdcmd_cmenu(osdfuncparm_t const * const parm)
return OSDCMD_OK; return OSDCMD_OK;
} }
extern void G_SetCrosshairColor(int32_t r, int32_t g, int32_t b);
extern palette_t CrosshairColors;
static int32_t osdcmd_crosshaircolor(osdfuncparm_t const * const parm) static int32_t osdcmd_crosshaircolor(osdfuncparm_t const * const parm)
{ {
@ -1781,7 +1781,7 @@ int32_t registerosdcommands(void)
} }
OSD_RegisterFunction("addpath","addpath <path>: adds path to game filesystem", osdcmd_addpath); OSD_RegisterFunction("addpath","addpath <path>: adds path to game filesystem", osdcmd_addpath);
OSD_RegisterFunction("bind","bind <key> <string>: associates a keypress with a string of console input. Type \"bind showkeys\" for a list of keys and \"listsymbols\" for a list of valid console commands.", osdcmd_bind); OSD_RegisterFunction("bind",R"(bind <key> <string>: associates a keypress with a string of console input. Type "bind showkeys" for a list of keys and "listsymbols" for a list of valid console commands.)", osdcmd_bind);
OSD_RegisterFunction("cmenu","cmenu <#>: jumps to menu", osdcmd_cmenu); OSD_RegisterFunction("cmenu","cmenu <#>: jumps to menu", osdcmd_cmenu);
OSD_RegisterFunction("crosshaircolor","crosshaircolor: changes the crosshair color", osdcmd_crosshaircolor); OSD_RegisterFunction("crosshaircolor","crosshaircolor: changes the crosshair color", osdcmd_crosshaircolor);