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

avoid team void (double meaning)

Browse Source
This commit is contained in:
flowtron
2021-06-22 13:23:42 +02:00
parent b39107f541
commit d5ac3cfab5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entity.h
+1 -2
View File
@@ -100,14 +100,13 @@ extern const char *teamnames[];
extern const char *teamnames_s[];
extern const char *killmessages[2][NUMGUNS];
#define TEAM_VOID TEAM_NUM
#define isteam(a,b) (m_teammode && (a) == (b))
#define team_opposite(o) (team_isvalid(o) && (o) < TEAM_SPECT ? (o) ^ 1 : TEAM_SPECT)
#define team_base(t) ((t) & 1)
#define team_basestring(t) ((t) == 1 ? teamnames[1] : ((t) == 0 ? teamnames[0] : "SPECT"))
#define team_isvalid(t) ((int(t)) >= 0 && (t) < TEAM_NUM)
#define team_isactive(t) ((t) == TEAM_CLA || (t) == TEAM_RVSF)
#define team_isspect(t) ((t) > TEAM_RVSF && (t) < TEAM_VOID)
#define team_isspect(t) ((t) > TEAM_RVSF && (t) < TEAM_NUM)
#define team_group(t) ((t) == TEAM_SPECT ? TEAM_SPECT : team_base(t))
#define team_tospec(t) ((t) == TEAM_SPECT ? TEAM_SPECT : team_base(t) + TEAM_CLA_SPECT - TEAM_CLA)
// note: team_isactive and team_base can/should be used to check the limits for arrays of size '2'
source/src/server.cpp
+3 -2
View File
@@ -1734,7 +1734,7 @@ bool spamdetect(client *cl, char *text) // checks doubled lines and average typi
void sendteamtext(char *text, int sender, int msgtype)
{
if(!valid_client(sender) || clients[sender]->team == TEAM_VOID) return;
if(!valid_client(sender) || clients[sender]->team == TEAM_NUM) return;
packetbuf p(MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
putint(p, msgtype);
putint(p, sender);
@@ -1755,7 +1755,7 @@ void sendteamtext(char *text, int sender, int msgtype)
void sendvoicecomteam(int sound, int sender)
{
if(!valid_client(sender) || clients[sender]->team == TEAM_VOID) return;
if(!valid_client(sender) || clients[sender]->team == TEAM_NUM) return;
packetbuf p(MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
putint(p, SV_VOICECOMTEAM);
putint(p, sender);
@@ -2047,6 +2047,7 @@ bool updateclientteam(int cln, int newteam, int ftr)
else
{
if(sg->autoteam && teamsizes[TEAM_CLA] != teamsizes[TEAM_RVSF]) newteam = teamsizes[TEAM_CLA] < teamsizes[TEAM_RVSF] ? TEAM_CLA : TEAM_RVSF;
if(newteam == TEAM_ANYACTIVE) newteam = rnd(2); // still undecided?
}
}
if(ftr == FTR_PLAYERWISH)