diff --git a/source/src/protocol.h b/source/src/protocol.h index 0ccc973b..7ae29a45 100644 --- a/source/src/protocol.h +++ b/source/src/protocol.h @@ -69,7 +69,7 @@ enum { HE_COMBO, HE_COMBO2, HE_COMBO3, HE_COMBO4, HE_COMBO5, HE_TEAMWORK, HE_FLA #define DVELF 4.0f enum { DISC_NONE = 0, DISC_EOP, DISC_CN, DISC_MKICK, DISC_MBAN, DISC_TAGT, DISC_BANREFUSE, DISC_WRONGPW, DISC_SOPLOGINFAIL, DISC_MAXCLIENTS, DISC_MASTERMODE, DISC_AUTOKICK, DISC_AUTOBAN, DISC_DUP, DISC_BADNICK, DISC_OVERFLOW, DISC_ABUSE, DISC_AFK, DISC_FFIRE, DISC_CHEAT, DISC_NUM }; -enum { BAN_NONE = 0, BAN_VOTE, BAN_BLACKLIST, BAN_MASTER }; +enum { BAN_NONE = 0, BAN_VOTE, BAN_AUTO, BAN_BLACKLIST, BAN_MASTER }; #define EXT_ACK -1 #define EXT_VERSION 104 diff --git a/source/src/server.cpp b/source/src/server.cpp index 5d1579bb..e45b3151 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -2037,10 +2037,10 @@ void addgban(const char *name) } } -void addban(client *cl, int reason) +inline void addban(client *cl, int reason, int type) { if(!cl) return; - ban b = { cl->peer->address, servmillis+scl.ban_time }; + ban b = { cl->peer->address, servmillis+scl.ban_time, type }; bans.add(b); disconnect_client(cl->clientnum, reason); } @@ -2056,7 +2056,7 @@ int getbantype(int cn) { ban &b = bans[i]; if(b.millis < servmillis) { bans.remove(i--); } - if(b.address.host == c.peer->address.host) { return BAN_VOTE; } + if(b.address.host == c.peer->address.host) return b.type; } return BAN_NONE; } diff --git a/source/src/server.h b/source/src/server.h index 7b30a41c..405fd950 100644 --- a/source/src/server.h +++ b/source/src/server.h @@ -355,7 +355,7 @@ struct client // server side version of "dynent" type struct ban { ENetAddress address; - int millis; + int millis, type; }; struct worldstate diff --git a/source/src/serverchecks.h b/source/src/serverchecks.h index 86cef81b..9a13a0a8 100644 --- a/source/src/serverchecks.h +++ b/source/src/serverchecks.h @@ -23,7 +23,7 @@ inline void checkclientpos(client *cl) #define POW2XY(A,B) (pow2(A.x-B.x)+pow2(A.y-B.y)) -extern void addban(client *cl, int reason); +extern inline void addban(client *cl, int reason, int type = BAN_AUTO); #ifdef ACAC #include "anticheat.h"