philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use L suffixed constant to match type of server.flags / server.flags2 field in (get|set)_server_flag()

Browse Source 
Also squash return value of get_server_flag() to 1 / 0.
This commit is contained in:
Kevin Easton
2017-08-22 23:07:49 +10:00
parent 05633c9bc3
commit f7de661f2f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/server.c
View File

@@ -1982,33 +1982,34 @@ void BX_set_server_flag (int ssf_index, int flag, int value)
ssf_index = primary_server; ssf_index = primary_server;
else if (ssf_index >= number_of_servers) else if (ssf_index >= number_of_servers)
return; return;
if (flag > 31) if (flag > 31)
{ {
if (value) if (value)
server_list[ssf_index].flags2 |= 0x1 << (flag - 32); server_list[ssf_index].flags2 |= 0x1L << (flag - 32);
else else
server_list[ssf_index].flags2 &= ~(0x1 << (flag - 32)); server_list[ssf_index].flags2 &= ~(0x1L << (flag - 32));
} }
else else
{ {
if (value) if (value)
server_list[ssf_index].flags |= 0x1 << flag; server_list[ssf_index].flags |= 0x1L << flag;
else else
server_list[ssf_index].flags &= ~(0x1 << flag); server_list[ssf_index].flags &= ~(0x1L << flag);
} }
set_umode(ssf_index); set_umode(ssf_index);
} }
int BX_get_server_flag (int gsf_index, int value) int BX_get_server_flag (int gsf_index, int flag)
{ {
if (gsf_index == -1) if (gsf_index == -1)
gsf_index = primary_server; gsf_index = primary_server;
else if (gsf_index >= number_of_servers) else if (gsf_index >= number_of_servers)
return 0; return 0;
if (value > 31) if (flag > 31)
return server_list[gsf_index].flags2 & (0x1 << (value - 32)); return !!(server_list[gsf_index].flags2 & (0x1L << (flag - 32)));
else else
return server_list[gsf_index].flags & (0x1 << value); return !!(server_list[gsf_index].flags & (0x1L << flag));
} }
/* /*