From d751ad5cf262b0557a86a2e5d028cabce0c06909 Mon Sep 17 00:00:00 2001 From: Sally Coolatta <tehrealsalt@gmail.com> Date: Wed, 9 Mar 2022 03:28:38 -0500 Subject: [PATCH] Remove "Multiplayer games can't unlock extras!" --- src/f_finale.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 4bb640d501..929a08eaff 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1642,37 +1642,27 @@ void F_GameEvaluationTicker(void) if (finalecount == 5*TICRATE) { - if (netgame || multiplayer) // modify this when we finally allow unlocking stuff in 2P + serverGamedata->timesBeaten++; + clientGamedata->timesBeaten++; + + if (ALL7EMERALDS(emeralds)) { - HU_SetCEchoFlags(V_YELLOWMAP|V_RETURN8); - HU_SetCEchoDuration(6); - HU_DoCEcho("\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\Multiplayer games can't unlock extras!"); - S_StartSound(NULL, sfx_s3k68); + serverGamedata->timesBeatenWithEmeralds++; + clientGamedata->timesBeatenWithEmeralds++; } - else - { - serverGamedata->timesBeaten++; - clientGamedata->timesBeaten++; - - if (ALL7EMERALDS(emeralds)) - { - serverGamedata->timesBeatenWithEmeralds++; - clientGamedata->timesBeatenWithEmeralds++; - } - if (ultimatemode) - { - serverGamedata->timesBeatenUltimate++; - clientGamedata->timesBeatenUltimate++; - } + if (ultimatemode) + { + serverGamedata->timesBeatenUltimate++; + clientGamedata->timesBeatenUltimate++; + } - M_SilentUpdateUnlockablesAndEmblems(serverGamedata); + M_SilentUpdateUnlockablesAndEmblems(serverGamedata); - if (M_UpdateUnlockablesAndExtraEmblems(clientGamedata)) - S_StartSound(NULL, sfx_s3k68); + if (M_UpdateUnlockablesAndExtraEmblems(clientGamedata)) + S_StartSound(NULL, sfx_s3k68); - G_SaveGameData(clientGamedata); - } + G_SaveGameData(clientGamedata); } } -- GitLab