summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-07-31 22:00:04 +0000
committerTim Angus <tim@ngus.net>2006-07-31 22:00:04 +0000
commitd721051b549269e3b4cdfa82846facbb1b2272bd (patch)
tree37496491e20053193481d46b1524cbeb77bd0acb /src
parentbd235d1ed7984e4f7625174cc7bcdd3ae7b25c92 (diff)
* Reconnect dialog upon server disconnect (bug #2805 tjw)
Diffstat (limited to 'src')
-rw-r--r--src/qcommon/common.c1
-rw-r--r--src/ui/ui_main.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/qcommon/common.c b/src/qcommon/common.c
index a33eb6fd..cc105ee8 100644
--- a/src/qcommon/common.c
+++ b/src/qcommon/common.c
@@ -255,6 +255,7 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
}
}
#endif
+ Cvar_Set("com_errorCode", va("%i", code));
// when we are running automated scripts, make sure we
// know if anything failed
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 735d0b62..b323322e 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -5587,7 +5587,10 @@ void _UI_SetActiveMenu( uiMenuCommand_t menu ) {
trap_Cvar_VariableStringBuffer("com_errorMessage", buf, sizeof(buf));
if (strlen(buf)) {
if (!ui_singlePlayerActive.integer) {
- Menus_ActivateByName("error_popmenu");
+ if( trap_Cvar_VariableValue( "com_errorCode" ) == ERR_SERVERDISCONNECT )
+ Menus_ActivateByName("drop_popmenu");
+ else
+ Menus_ActivateByName("error_popmenu");
} else {
trap_Cvar_Set("com_errorMessage", "");
}