From 348ad7c1f0a2d99a72ae8dd30eac7486d91a3914 Mon Sep 17 00:00:00 2001 From: katsy Date: Tue, 7 May 2024 12:15:10 -0500 Subject: [PATCH] Remove leftover Record Attack lockout warnings --- src/d_netcmd.c | 10 ++++------ src/g_game.c | 7 ++----- src/menus/extras-addons.c | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index d887aaf73..af60224f9 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -6461,14 +6461,12 @@ void Command_Retry_f(void) */ static void Command_Isgamemodified_f(void) { - if (majormods) - CONS_Printf("The game has been modified with major addons, so you cannot play Record Attack.\n"); - else if (savemoddata) - CONS_Printf("The game has been modified with an addon with its own save data, so you can play Record Attack and earn medals.\n"); + if (savemoddata) + CONS_Printf("The game has been modified with an addon using its own save data.\n"); else if (modifiedgame) - CONS_Printf("The game has been modified with only minor addons. You can play Record Attack, earn medals and unlock extras.\n"); + CONS_Printf("The game has been modified, but is still using Ring Racers save data.\n"); else - CONS_Printf("The game has not been modified. You can play Record Attack, earn medals and unlock extras.\n"); + CONS_Printf("The game has not been modified.\n"); } #ifdef _DEBUG diff --git a/src/g_game.c b/src/g_game.c index e2cd5ad70..08ea0274e 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -358,7 +358,7 @@ void G_ClearRecords(void) // TODO: Technically, these should only remove time attack records here. // But I'm out of juice for dev (+ literally, just finished some OJ). - // The stats need to be cleared in M_ClearStats, and I guess there's + // The stats need to be cleared in M_ClearStats, and I guess there's // no perfect place to wipe mapvisited because it's not actually part of // basegame progression... so here's fine for launch. ~toast 100424 unloaded_mapheader_t *unloadedmap, *nextunloadedmap = NULL; @@ -652,7 +652,7 @@ static void G_UpdateRecordReplays(void) } } -// for consistency among messages: this modifies the game and removes savemoddata. +// for consistency among messages: this marks the game as modified. void G_SetGameModified(boolean silent, boolean major) { if ((majormods && modifiedgame) || !mainwads || (refreshdirmenu & REFRESHDIR_GAMEDATA)) // new gamedata amnesty? @@ -666,9 +666,6 @@ void G_SetGameModified(boolean silent, boolean major) //savemoddata = false; -- there is literally no reason to do this anymore. majormods = true; - if (!silent) - CONS_Alert(CONS_NOTICE, M_GetText("Game must be restarted to play Record Attack.\n")); - // If in record attack recording, cancel it. if (modeattacking) M_EndModeAttackRun(); diff --git a/src/menus/extras-addons.c b/src/menus/extras-addons.c index 09a8d9624..22c1c204a 100644 --- a/src/menus/extras-addons.c +++ b/src/menus/extras-addons.c @@ -157,7 +157,7 @@ void M_AddonsRefresh(void) else if (majormods && !prevmajormods) { S_StartSound(NULL, sfx_s221); - message = va("%c%s\x80\nYou've loaded a gameplay-modifying addon.\n\nRecord Attack has been disabled, but you\ncan still play alone in local Multiplayer.\n\nIf you wish to play Record Attack mode, restart the game to disable loaded addons.\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname); + message = va("%c%s\x80\nYou've loaded a gameplay-modifying addon.\nCheck the console log for more info.\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname); prevmajormods = majormods; }