stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clarify addon-related messages

Browse source
This commit is contained in:
AJ Martinez 2020-08-05 00:40:56 -05:00
parent c3c466575c
commit 8284caf1bc
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/d_clisrv.c
View file

@ -1923,11 +1923,11 @@ static boolean CL_FinishedFileList(void)
CL_Reset(); CL_Reset();
D_StartTitle(); D_StartTitle();
M_StartMessage(M_GetText( M_StartMessage(M_GetText(
"You have WAD files loaded or have\n" "You have the wrong addons loaded.\n\n"
"modified the game in some way, and\n" "To play on this server, restart\n"
"your file list does not match\n" "the game and don't load any addons.\n"
"the server's file list.\n" "SRB2Kart will automatically add\n"
"Please restart SRB2Kart before connecting.\n\n" "everything you need when you join.\n\n"
"Press ESC\n" "Press ESC\n"
), NULL, MM_NOTHING); ), NULL, MM_NOTHING);
return false; return false;
@ -1948,11 +1948,12 @@ static boolean CL_FinishedFileList(void)
CL_Reset(); CL_Reset();
D_StartTitle(); D_StartTitle();
M_StartMessage(M_GetText( M_StartMessage(M_GetText(
"You cannot connect to this server\n" "An error occured when trying to\n"
"because you cannot download the files\n" "download missing addons.\n"
"that you are missing from the server.\n\n" "(This is almost always a problem\n"
"See the console or log file for\n" "with the server, not your game.)\n\n"
"more details.\n\n" "See the console or log file\n"
"for additional details.\n\n"
"Press ESC\n" "Press ESC\n"
), NULL, MM_NOTHING); ), NULL, MM_NOTHING);
return false; return false;

4
src/m_menu.c
View file

@ -4833,7 +4833,7 @@ static boolean M_AddonsRefresh(void)
else if (majormods && !prevmajormods) else if (majormods && !prevmajormods)
{ {
S_StartSound(NULL, sfx_s221); S_StartSound(NULL, sfx_s221);
message = va("%c%s\x80\nGameplay has now been modified.\nIf you wish to play Record Attack mode, restart the game to clear existing addons.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname); 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\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
prevmajormods = majormods; prevmajormods = majormods;
} }
@ -8538,7 +8538,7 @@ static void M_ConnectMenuModChecks(INT32 choice)
if (modifiedgame) if (modifiedgame)
{ {
M_StartMessage(M_GetText("Addons are currently loaded.\n\nYou will only be able to join a server if\nit has the same ones loaded in the same order, which may be unlikely.\n\nIf you wish to play on other servers,\nrestart the game to clear existing addons.\n\n(Press a key)\n"),M_ConnectMenu,MM_EVENTHANDLER); M_StartMessage(M_GetText("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n"),M_ConnectMenu,MM_EVENTHANDLER);
return; return;
} }