diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 00760e4a4..a0f6fe7f5 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -937,6 +937,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_chatbacktint); CV_RegisterVar(&cv_chatcentertext); CV_RegisterVar(&cv_songcredits); + CV_RegisterVar(&cv_pausesongcredits); CV_RegisterVar(&cv_showfreeplay); CV_RegisterVar(&cv_skinselectspin); CV_RegisterVar(&cv_showallmaps); diff --git a/src/g_game.c b/src/g_game.c index 55c2c6c1a..b76c1290a 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -312,6 +312,8 @@ consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, N static CV_PossibleValue_t songcredits_cons_t[] = {{0, "Off"}, {1, "Default"}, {2, "Box"}, {0, NULL}}; consvar_t cv_songcredits = {"songcredits", "Default", CV_SAVE, songcredits_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_pausesongcredits = {"pausesongcredits", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + // Show "FREE PLAY" when you're alone. :( consvar_t cv_showfreeplay = { "showfreeplay", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/g_game.h b/src/g_game.h index b300bca9e..c3b89435d 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -50,7 +50,7 @@ extern INT16 rw_maximums[NUM_WEAPONS]; // used in game menu extern consvar_t cv_chatwidth, cv_chatnotifications, cv_chatheight, cv_chattime, cv_consolechat, cv_chatbacktint, cv_chatspamprotection, cv_chatcentertext/*, cv_compactscoreboard*/; -extern consvar_t cv_songcredits; +extern consvar_t cv_songcredits, cv_pausesongcredits; extern consvar_t cv_showfreeplay; extern consvar_t cv_growmusic, cv_supermusic; extern consvar_t cv_pauseifunfocused; diff --git a/src/m_menu.c b/src/m_menu.c index 031c64447..9fe60d0a4 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2723,6 +2723,12 @@ static void M_DrawPauseMenu(void) } #endif + musicdef_t *def; + if (cv_pausesongcredits.value && (def = S_FindMusicCredit(S_MusicName())) != NULL) + { + V_DrawThinString(2, 2, V_SNAPTOTOP|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x1F"" %s", def->source)); + } + M_DrawGenericMenu(); } diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 7121f2065..fa5e66cfe 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -1849,15 +1849,16 @@ static menuitem_t OP_SaturnHudMenu[] = {IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 150}, {IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 160}, + {IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 165}, - {IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 170}, + {IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 175}, - {IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 180}, + {IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 185}, - {IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 190}, - {IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 195}, + {IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 195}, + {IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 200}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 205}, + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 210}, }; static const char* OP_SaturnHudTooltips[] = @@ -1884,6 +1885,7 @@ static const char* OP_SaturnHudTooltips[] = "Erratically rotate player icons during spinouts.", "Visualize the player facing angle.", "Show the Music Credits and which style.", + "Show the Music Credits while in pause menu.", "Make the Intermission screen look like in beta versions of Kart!\nEither with background or just the rest.", "Show the Director Toggle prompt when spectating.", "Nametag Options.",