From 094646fcc72653496a301fdda741998abfbfbad3 Mon Sep 17 00:00:00 2001 From: Rafael Barreto Date: Tue, 1 Jun 2010 17:36:33 +0000 Subject: [PATCH] sending the name (no effective effect) git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5129 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/serveractions.h | 2 +- source/src/serverbrowser.cpp | 5 ++++- source/src/serverms.cpp | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/src/serveractions.h b/source/src/serveractions.h index 76c9c3bb..6eaae813 100644 --- a/source/src/serveractions.h +++ b/source/src/serveractions.h @@ -69,7 +69,7 @@ struct mapaction : serveraction { bool notify = valid_client(caller); int maploc = MAP_NOTFOUND; - mapstats *ms = map[0] ? getservermapstats(map, false, &maploc) : NULL; // this is very redundant, since startgame gets the layout + mapstats *ms = map[0] ? getservermapstats(map, false, &maploc) : NULL; mapok = mode == GMODE_COOPEDIT || ( ms != NULL && mapisok(ms) ); if(!mapok) { diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp index 1acb3264..335d568e 100644 --- a/source/src/serverbrowser.cpp +++ b/source/src/serverbrowser.cpp @@ -1267,6 +1267,7 @@ void clearservers() } #define RETRIEVELIMIT 20000 +extern char *global_name; void retrieveservers(vector &data) { @@ -1278,7 +1279,9 @@ void retrieveservers(vector &data) show_out_of_renderloop_progress(0, text); int starttime = SDL_GetTicks(), timeout = 0; - const char *req = "list\n"; + string request; + sprintf(request, "list %s\n",global_name); + const char *req = request; int reqlen = strlen(req); ENetBuffer buf; while(reqlen > 0) diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp index fd3a20f4..259f29fb 100644 --- a/source/src/serverms.cpp +++ b/source/src/serverms.cpp @@ -155,12 +155,14 @@ void flushmasterinput() else disconnectmaster(); } +extern char *global_name; + // send alive signal to masterserver every hour of uptime static inline void updatemasterserver(int millis, int port) { if(!lastupdatemaster || millis-lastupdatemaster>60*60*1000) { - if(mastername[0]) requestmasterf("regserv %d\n", port); + if(mastername[0]) requestmasterf("regserv %d %s\n", port, global_name); lastupdatemaster = millis ? millis : 1; } }