aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-12-31 22:35:22 +0000
committertjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-12-31 22:35:22 +0000
commit6c28490fc7f5130cd73d80e47e18a6cd77bdc10f (patch)
treedd7e355bfb135ae3c307b2e326c27052c3b34318
parent5ffa5f47db2992606e451225d0d8be4e262a52c8 (diff)
downloadioquake3-aero-6c28490fc7f5130cd73d80e47e18a6cd77bdc10f.tar.gz
ioquake3-aero-6c28490fc7f5130cd73d80e47e18a6cd77bdc10f.zip
* send along the reason for disconnection when sending the disconnect
cmd to all clients in SV_FinalMessage() * on Com_Error(), set the cvar "com_errorCode" with the errorParm_t integer value for the error. This can be used by a mod's ui to an draw error dialog specific for the error (e.g. Reconnect button on ERR_SERVERDISCONNECT) git-svn-id: svn://svn.icculus.org/quake3/trunk@1245 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/qcommon/common.c2
-rw-r--r--code/server/sv_init.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index ba155bd..d3bb089 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -244,6 +244,8 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
static int errorCount;
int currentTime;
+ Cvar_Set( "com_errorCode", va( "%i", code ) );
+
// when we are running automated scripts, make sure we
// know if anything failed
if ( com_buildScript && com_buildScript->integer ) {
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 9284127..69d08ea 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -708,7 +708,7 @@ void SV_FinalMessage( char *message ) {
// don't send a disconnect to a local client
if ( cl->netchan.remoteAddress.type != NA_LOOPBACK ) {
SV_SendServerCommand( cl, "print \"%s\n\"\n", message );
- SV_SendServerCommand( cl, "disconnect" );
+ SV_SendServerCommand( cl, "disconnect \"%s\"", message );
}
// force a snapshot to be sent
cl->nextSnapshotTime = -1;