From f602b02641142bef5225b9f94530a07d58dcfb19 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Sun, 16 Dec 2012 19:20:08 +0000
Subject: Save all arguments from connect for reconnect command. Remove
unnecessary localhost check from reconnect command.
---
src/client/cl_main.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index e2cd7ddd..3244bc7c 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -127,7 +127,7 @@ clientConnection_t clc;
clientStatic_t cls;
vm_t *cgvm;
-char cl_reconnectServername[MAX_OSPATH];
+char cl_reconnectArgs[MAX_OSPATH];
char cl_oldGame[MAX_QPATH];
qboolean cl_oldGameSet;
@@ -1611,14 +1611,10 @@ CL_Reconnect_f
================
*/
void CL_Reconnect_f( void ) {
- if ( !strlen( cl_reconnectServername ) )
+ if ( !strlen( cl_reconnectArgs ) )
return;
- if ( !strcmp( cl_reconnectServername, "localhost" ) ) {
- Com_Printf( "Can't reconnect to localhost.\n" );
- return;
- }
Cvar_Set("ui_singlePlayerActive", "0");
- Cbuf_AddText( va("connect %s\n", cl_reconnectServername ) );
+ Cbuf_AddText( va("connect %s\n", cl_reconnectArgs ) );
}
/*
@@ -1652,6 +1648,9 @@ void CL_Connect_f( void ) {
server = Cmd_Argv(2);
}
+ // save arguments for reconnect
+ Q_strncpyz( cl_reconnectArgs, Cmd_Args(), sizeof( cl_reconnectArgs ) );
+
Cvar_Set("ui_singlePlayerActive", "0");
// fire a message off to the motd server
@@ -1674,7 +1673,6 @@ void CL_Connect_f( void ) {
Con_Close();
Q_strncpyz( clc.servername, server, sizeof(clc.servername) );
- Q_strncpyz( cl_reconnectServername, server, sizeof( cl_reconnectServername ) );
if (!NET_StringToAdr(clc.servername, &clc.serverAddress, family) ) {
Com_Printf ("Bad server address\n");
--
cgit