diff --git a/source/src/client.cpp b/source/src/client.cpp index e157529f..7de0e392 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -107,8 +107,20 @@ void connectserv_(const char *servername, int serverport = 0, const char *passwo void connectserv(char *servername, int *serverport, char *password) { - modprotocol = false; - connectserv_(servername, *serverport, password); + if(sk) + { + modprotocol = false; + connectserv_(servername, *serverport, password); + }else{ + extern char *aaconnect;// assaultcube://example.org[:28763][/][?[port=28763][&password=secret]] + string cp1, cp2, cp3, cpc; + formatstring(cp1)("assaultcube://%s",servername); + if(serverport)formatstring(cp2)(":%d",*serverport); + if(password)formatstring(cp3)("/?password=%s",password); + formatstring(cpc)("%s%s%s", cp1, cp2, cp3); + aaconnect = newstring(cpc); + hudoutf("\f5.. \f2waiting \f4for \fUauth\f5entication .."); + } } COMMANDN(connect, connectserv, "sis"); @@ -340,8 +352,8 @@ void addmsg(int type, const char *fmt, ...) case 's': { const char *t = va_arg(args, const char *); - sendstring(t, p); - nums++; + sendstring(t, p); + nums++; break; } } diff --git a/source/src/main.cpp b/source/src/main.cpp index bc60c251..e3d42881 100644 --- a/source/src/main.cpp +++ b/source/src/main.cpp @@ -1128,7 +1128,7 @@ void connectprotocol(char *protocolstring) // assaultcube://example.org[:28763][ } int bakshowmenuonstartup = -1; -static char *aaconnect = NULL; +char *aaconnect = NULL; void afterauth() { // currently only for delayed connectprotocol