eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Be a bit more verbose about errors.

Browse source
This commit is contained in:
Shpoike 2023-08-11 15:03:25 +01:00
parent dbb9aa329a
commit e907f6adf0
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_main.c
View file

@ -1630,7 +1630,7 @@ CL_Connect_f
================ ================
*/ */
void CL_Connect_c(int argn, const char *partial, struct xcommandargcompletioncb_s *ctx); void CL_Connect_c(int argn, const char *partial, struct xcommandargcompletioncb_s *ctx);
void CL_Connect_f (void) static void CL_Connect_f (void)
{ {
char *server; char *server;

9
engine/client/menu.c
View file

@ -399,6 +399,15 @@ void M_ToggleMenu_f (void)
#endif #endif
#ifndef NOBUILTINMENUS #ifndef NOBUILTINMENUS
{
extern cvar_t cl_disconnectreason;
if (*cl_disconnectreason.string)
{
Menu_Prompt(NULL, NULL, cl_disconnectreason.string, NULL, NULL, "Okay", true);
Cvar_Set(&cl_disconnectreason, "");
}
}
M_Menu_Main_f (); M_Menu_Main_f ();
Key_Dest_Remove(kdm_console|kdm_cwindows); Key_Dest_Remove(kdm_console|kdm_cwindows);
#endif #endif

3
engine/server/sv_main.c
View file

@ -381,11 +381,10 @@ void VARGS SV_Error (char *error, ...)
if (!isDedicated) //dedicated servers crash... if (!isDedicated) //dedicated servers crash...
{ {
extern cvar_t cl_disconnectreason;
extern jmp_buf host_abort; extern jmp_buf host_abort;
SCR_EndLoadingPlaque(); SCR_EndLoadingPlaque();
SV_UnspawnServer(); SV_UnspawnServer();
Cvar_Set(&cl_disconnectreason, va("SV_Error: %s", string)); CL_Disconnect(string);
inerror=false; inerror=false;
longjmp (host_abort, 1); longjmp (host_abort, 1);
} }