kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parsing of commandline switches for servers

Browse Source 
also:
 * -Y now sets the private key for the server
 * -m without argument uses default masterserver URL
 * servers run LAN-only by default (set ms URL and private key to
   register with the master)
 * use generic locale "POSIX"
This commit is contained in:
ac-stef
2017-06-27 15:15:21 +02:00
parent 25deee5287
commit c8c310886a
9 changed files with 75 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/serverbrowser.cpp
+2 -3
View File
@@ -1306,7 +1306,6 @@ void clearservers()
#define RETRIEVELIMIT 5000
extern char *global_name;
bool cllock = false, clfail = false;
int progress_callback_retrieveservers(void *data, float progress)
@@ -1330,7 +1329,7 @@ void retrieveservers(vector<char> &data)
if(h.set_host(mastername))
{
formatstring(progresstext)("retrieving servers from %s:%d... (esc to abort)", mastername, masterport);
defformatstring(url)("/retrieve.do?action=list&name=%s&version=%d&build=%d", urlencode(global_name, true), AC_VERSION, getbuildtype()|(1<<16));
defformatstring(url)("/retrieve.do?action=list&name=%s&version=%d&build=%d", urlencode(player1->name, true), AC_VERSION, getbuildtype()|(1<<16));
h.outvec = (vector<uchar> *) &data; // ouch...
show_out_of_renderloop_progress(0, progresstext);
int got = h.get(url, RETRIEVELIMIT, RETRIEVELIMIT);
@@ -1358,7 +1357,7 @@ void retrieveservers(vector<char> &data)
defformatstring(text)("retrieving servers from %s:%d... (esc to abort)", mastername, masterport);
show_out_of_renderloop_progress(0, text);
int starttime = SDL_GetTicks(), timeout = 0;
defformatstring(request)("list %s %d %d\n", global_name, AC_VERSION, getbuildtype());
defformatstring(request)("list %s %d %d\n", player1->name, AC_VERSION, getbuildtype());
const char *req = request;
int reqlen = strlen(req);
ENetBuffer buf;