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

configurable voting permissions; missing config file warning; fixed kick, ban & forceteam votes; write recorded demos to files; optionally restrict a server to server-provided maps; scoreboard status logging fixed & extended; extended traffic logging; custom server description reset condition modified

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3813 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2008-12-01 17:37:56 +00:00
parent 9cd8226971
commit 2841abac26
4 changed files with 197 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/serverms.cpp
+9 -4
View File
@@ -157,7 +157,7 @@ uchar *retrieveservers(uchar *buf, int buflen)
ENetSocket pongsock = ENET_SOCKET_NULL, lansock = ENET_SOCKET_NULL;
string serverdesc;
void serverms(int mode, int numplayers, int minremain, char *smapname, int millis, const ENetAddress &localaddr)
void serverms(int mode, int numplayers, int minremain, char *smapname, int millis, const ENetAddress &localaddr, int *mnum, int *msend, int *mrec, int *cnum, int *csend, int *crec)
{
checkmasterreply();
updatemasterserver(millis, localaddr);
@@ -179,7 +179,7 @@ void serverms(int mode, int numplayers, int minremain, char *smapname, int milli
{
ENetSocket sock = i ? lansock : pongsock;
if(!ENET_SOCKETSET_CHECK(sockset, sock)) continue;
buf.dataLength = sizeof(data);
len = enet_socket_receive(sock, &addr, &buf, 1);
if(len < 0) continue;
@@ -188,8 +188,10 @@ void serverms(int mode, int numplayers, int minremain, char *smapname, int milli
ucharbuf pi(data, sizeof(data));
ucharbuf po(&data[len], sizeof(data)-len);
bool std = false;
if(getint(pi) != 0) // std pong
{
(*mnum)++; *mrec += len; std = true;
putint(po, PROTOCOL_VERSION);
putint(po, mode);
putint(po, numplayers);
@@ -200,6 +202,7 @@ void serverms(int mode, int numplayers, int minremain, char *smapname, int milli
}
else // ext pong - additional server infos
{
(*cnum)++; *crec += len;
int extcmd = getint(pi);
putint(po, EXT_ACK);
putint(po, EXT_VERSION);
@@ -225,11 +228,11 @@ void serverms(int mode, int numplayers, int minremain, char *smapname, int milli
int bpos = po.length(); // remember buffer position
putint(po, EXT_PLAYERSTATS_RESP_IDS); // send player ids following
extinfo_cnbuf(po, cn);
buf.dataLength = len + po.length();
*csend += buf.dataLength = len + po.length();
enet_socket_send(pongsock, &addr, &buf, 1); // send all available player ids
po.len = bpos;
extinfo_statsbuf(po, cn, bpos, pongsock, addr, buf, len);
extinfo_statsbuf(po, cn, bpos, pongsock, addr, buf, len, csend);
return;
}
@@ -245,6 +248,8 @@ void serverms(int mode, int numplayers, int minremain, char *smapname, int milli
buf.dataLength = len + po.length();
enet_socket_send(pongsock, &addr, &buf, 1);
if(std) *msend += buf.dataLength;
else *csend += buf.dataLength;
}
}