From 2f80c5bae58fd1c292dd4d561c6776ac345e85ce Mon Sep 17 00:00:00 2001 From: ac-stef Date: Sat, 10 Sep 2016 15:26:32 +0200 Subject: [PATCH] add channel for less important server messages (so that the client can choose to not display them) --- source/src/clients2c.cpp | 1 + source/src/protocol.cpp | 2 +- source/src/protocol.h | 2 +- source/src/server.cpp | 7 ++++++- source/src/server.h | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index fb1673ae..d15d8d77 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -1090,6 +1090,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false) break; } + case SV_SERVMSGVERB: // FIXME case SV_SERVMSG: getstring(text, p); conoutf("%s", text); diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp index 9434627e..afea8e33 100644 --- a/source/src/protocol.cpp +++ b/source/src/protocol.cpp @@ -539,7 +539,7 @@ static const int msgsizes[] = // size inclusive message token, 0 f SV_PING, 2, SV_PONG, 2, SV_CLIENTPING, 2, SV_GAMEMODE, 2, SV_EDITMODE, 2, SV_EDITXY, 8, SV_EDITARCH, 56, SV_EDITBLOCK, 0, SV_EDITD, 6, SV_EDITE, 6, SV_NEWMAP, 2, SV_SENDMAP, 0, SV_RECVMAP, 1, SV_REMOVEMAP, 0, - SV_SERVMSG, 0, SV_ITEMLIST, 0, SV_WEAPCHANGE, 2, SV_PRIMARYWEAP, 2, + SV_SERVMSG, 0, SV_SERVMSGVERB, 0, SV_ITEMLIST, 0, SV_WEAPCHANGE, 2, SV_PRIMARYWEAP, 2, SV_FLAGACTION, 3, SV_FLAGINFO, 0, SV_FLAGMSG, 0, SV_FLAGCNT, 3, SV_ARENAWIN, 2, SV_SETADMIN, 0, SV_SERVOPINFO, 3, diff --git a/source/src/protocol.h b/source/src/protocol.h index 752fa27c..d0de6afc 100644 --- a/source/src/protocol.h +++ b/source/src/protocol.h @@ -35,7 +35,7 @@ enum SV_PING, SV_PONG, SV_CLIENTPING, SV_GAMEMODE, SV_EDITMODE, SV_EDITXY, SV_EDITARCH, SV_EDITBLOCK, SV_EDITD, SV_EDITE, SV_NEWMAP, SV_SENDMAP, SV_RECVMAP, SV_REMOVEMAP, - SV_SERVMSG, SV_ITEMLIST, SV_WEAPCHANGE, SV_PRIMARYWEAP, + SV_SERVMSG, SV_SERVMSGVERB, SV_ITEMLIST, SV_WEAPCHANGE, SV_PRIMARYWEAP, SV_FLAGACTION, SV_FLAGINFO, SV_FLAGMSG, SV_FLAGCNT, SV_ARENAWIN, SV_SETADMIN, SV_SERVOPINFO, diff --git a/source/src/server.cpp b/source/src/server.cpp index 4f579423..9585909c 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -724,6 +724,11 @@ void sendservmsg(const char *msg, int cn = -1) sendf(cn, 1, "ris", SV_SERVMSG, msg); } +void sendservmsgverbose(const char *msg, int cn = -1) // channel server spam here... +{ + sendf(cn, 1, "ris", SV_SERVMSGVERB, msg); +} + void sendspawn(client *c) { if(team_isspect(c->team)) return; @@ -2843,7 +2848,7 @@ int checktype(int type, client *cl) SV_GIBDAMAGE, SV_DAMAGE, SV_HITPUSH, SV_SHOTFX, SV_AUTHREQ, SV_AUTHCHAL, SV_SPAWNSTATE, SV_SPAWNDENY, SV_FORCEDEATH, SV_RESUME, SV_DISCSCORES, SV_TIMEUP, SV_ITEMACC, SV_MAPCHANGE, SV_ITEMSPAWN, SV_PONG, - SV_SERVMSG, SV_ITEMLIST, SV_FLAGINFO, SV_FLAGMSG, SV_FLAGCNT, + SV_SERVMSG, SV_SERVMSGVERB, SV_ITEMLIST, SV_FLAGINFO, SV_FLAGMSG, SV_FLAGCNT, SV_ARENAWIN, SV_SERVOPINFO, SV_CALLVOTESUC, SV_CALLVOTEERR, SV_VOTERESULT, SV_SETTEAM, SV_TEAMDENY, SV_SERVERMODE, SV_IPLIST, diff --git a/source/src/server.h b/source/src/server.h index 7c35012d..c9d681d1 100644 --- a/source/src/server.h +++ b/source/src/server.h @@ -475,7 +475,7 @@ const char *messagenames[SV_NUM] = "SV_PING", "SV_PONG", "SV_CLIENTPING", "SV_GAMEMODE", "SV_EDITMODE", "SV_EDITXY", "SV_EDITARCH", "SV_EDITBLOCK", "SV_EDITD", "SV_EDITE", "SV_NEWMAP", "SV_SENDMAP", "SV_RECVMAP", "SV_REMOVEMAP", - "SV_SERVMSG", "SV_ITEMLIST", "SV_WEAPCHANGE", "SV_PRIMARYWEAP", + "SV_SERVMSG", "SV_SERVMSGVERB", "SV_ITEMLIST", "SV_WEAPCHANGE", "SV_PRIMARYWEAP", "SV_FLAGACTION", "SV_FLAGINFO", "SV_FLAGMSG", "SV_FLAGCNT", "SV_ARENAWIN", "SV_SETADMIN", "SV_SERVOPINFO",