diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp index 82e1f2415..a4ccc7c80 100644 --- a/source/duke3d/src/common.cpp +++ b/source/duke3d/src/common.cpp @@ -833,14 +833,14 @@ void G_AddSearchPaths(void) // Duke Nukem 3D: 20th Anniversary World Tour (Steam) 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); } // Duke Nukem 3D: Megaton Edition (Steam) 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; 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) 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; DWORD const remaining = sizeof(buf) - bufsize; @@ -897,7 +897,7 @@ void G_AddSearchPaths(void) // NAM (Steam) 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; DWORD const remaining = sizeof(buf) - bufsize; @@ -908,7 +908,7 @@ void G_AddSearchPaths(void) // WWII GI (Steam) 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; DWORD const remaining = sizeof(buf) - bufsize; diff --git a/source/duke3d/src/osdcmds.cpp b/source/duke3d/src/osdcmds.cpp index 88e9a3a16..696a73174 100644 --- a/source/duke3d/src/osdcmds.cpp +++ b/source/duke3d/src/osdcmds.cpp @@ -743,8 +743,8 @@ static int32_t osdcmd_cmenu(osdfuncparm_t const * const parm) 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) { @@ -1781,7 +1781,7 @@ int32_t registerosdcommands(void) } OSD_RegisterFunction("addpath","addpath : adds path to game filesystem", osdcmd_addpath); - OSD_RegisterFunction("bind","bind : 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 : 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("crosshaircolor","crosshaircolor: changes the crosshair color", osdcmd_crosshaircolor);