From 21b5d68685164fa912a3947d9961991148868fb0 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Wed, 30 Nov 2005 02:26:12 +0000 Subject: [PATCH] Spike broke CVS build due to not committing cl_ignore.c git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1635 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_main.c | 2 ++ engine/client/cl_parse.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 301ac1460..033a341c5 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -2693,7 +2693,9 @@ void CL_Init (void) Cmd_AddCommand ("windows", CL_Windows_f); #endif +#ifdef SPIKECOMMITTEDCLIGNORE Ignore_Init(); +#endif } diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c index c8310345e..8b57f35ab 100644 --- a/engine/client/cl_parse.c +++ b/engine/client/cl_parse.c @@ -20,7 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // cl_parse.c -- parse a message received from the server #include "quakedef.h" +#ifdef SPIKECOMMITTEDCLIGNORE #include "cl_ignore.h" +#endif void CL_GetNumberedEntityInfo (int num, float *org, float *ang); void CLNQ_ParseDarkPlaces5Entities(void); @@ -3099,12 +3101,13 @@ char *CL_ParseChat(char *text, player_info_t **player) if ((int)msg_filter.value & flags) return NULL; //filter chat +#ifdef SPIKECOMMITTEDCLIGNORE check_flood = Ignore_Check_Flood(s, flags, offset); if (check_flood == IGNORE_NO_ADD) return NULL; else if (check_flood == NO_IGNORE_ADD) Ignore_Flood_Add(s); - +#endif } suppress_talksound = false; @@ -3616,6 +3619,9 @@ void CL_ParseServerMessage (void) case svc_print: i = MSG_ReadByte (); s = MSG_ReadString (); + + // Plug_Message(0, i, s); + if (i == PRINT_CHAT) { char *msg; @@ -4073,6 +4079,9 @@ void CLQ2_ParseServerMessage (void) case svcq2_print: //10 // [qbyte] id [string] null terminated string i = MSG_ReadByte (); s = MSG_ReadString (); + + // Plug_Message(0, i, s); + if (i == PRINT_CHAT) { char *msg; @@ -4297,11 +4306,15 @@ void CLNQ_ParseServerMessage (void) case svc_print: s = MSG_ReadString (); + if (*s == 1 || *s == 2) { char *msg; player_info_t *plr = NULL; + // Plug_Message(0, PRINT_CHAT, s); + + if (msg = CL_ParseChat(s+1, &plr)) { CL_ParsePrint(s+1, PRINT_CHAT); @@ -4310,6 +4323,8 @@ void CLNQ_ParseServerMessage (void) } else { + // Plug_Message(0, PRINT_HIGH, s); + CL_ParsePrint(s, PRINT_HIGH); CL_PrintStandardMessage(s); }