eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Spike broke CVS build due to not committing cl_ignore.c

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1635 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-11-30 02:26:12 +00:00
parent 339d478659
commit 21b5d68685
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_main.c
View file

@ -2693,7 +2693,9 @@ void CL_Init (void)
Cmd_AddCommand ("windows", CL_Windows_f); Cmd_AddCommand ("windows", CL_Windows_f);
#endif #endif
#ifdef SPIKECOMMITTEDCLIGNORE
Ignore_Init(); Ignore_Init();
#endif
} }

17
engine/client/cl_parse.c
View file

@ -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 // cl_parse.c -- parse a message received from the server
#include "quakedef.h" #include "quakedef.h"
#ifdef SPIKECOMMITTEDCLIGNORE
#include "cl_ignore.h" #include "cl_ignore.h"
#endif
void CL_GetNumberedEntityInfo (int num, float *org, float *ang); void CL_GetNumberedEntityInfo (int num, float *org, float *ang);
void CLNQ_ParseDarkPlaces5Entities(void); void CLNQ_ParseDarkPlaces5Entities(void);
@ -3099,12 +3101,13 @@ char *CL_ParseChat(char *text, player_info_t **player)
if ((int)msg_filter.value & flags) if ((int)msg_filter.value & flags)
return NULL; //filter chat return NULL; //filter chat
#ifdef SPIKECOMMITTEDCLIGNORE
check_flood = Ignore_Check_Flood(s, flags, offset); check_flood = Ignore_Check_Flood(s, flags, offset);
if (check_flood == IGNORE_NO_ADD) if (check_flood == IGNORE_NO_ADD)
return NULL; return NULL;
else if (check_flood == NO_IGNORE_ADD) else if (check_flood == NO_IGNORE_ADD)
Ignore_Flood_Add(s); Ignore_Flood_Add(s);
#endif
} }
suppress_talksound = false; suppress_talksound = false;
@ -3616,6 +3619,9 @@ void CL_ParseServerMessage (void)
case svc_print: case svc_print:
i = MSG_ReadByte (); i = MSG_ReadByte ();
s = MSG_ReadString (); s = MSG_ReadString ();
// Plug_Message(0, i, s);
if (i == PRINT_CHAT) if (i == PRINT_CHAT)
{ {
char *msg; char *msg;
@ -4073,6 +4079,9 @@ void CLQ2_ParseServerMessage (void)
case svcq2_print: //10 // [qbyte] id [string] null terminated string case svcq2_print: //10 // [qbyte] id [string] null terminated string
i = MSG_ReadByte (); i = MSG_ReadByte ();
s = MSG_ReadString (); s = MSG_ReadString ();
// Plug_Message(0, i, s);
if (i == PRINT_CHAT) if (i == PRINT_CHAT)
{ {
char *msg; char *msg;
@ -4297,11 +4306,15 @@ void CLNQ_ParseServerMessage (void)
case svc_print: case svc_print:
s = MSG_ReadString (); s = MSG_ReadString ();
if (*s == 1 || *s == 2) if (*s == 1 || *s == 2)
{ {
char *msg; char *msg;
player_info_t *plr = NULL; player_info_t *plr = NULL;
// Plug_Message(0, PRINT_CHAT, s);
if (msg = CL_ParseChat(s+1, &plr)) if (msg = CL_ParseChat(s+1, &plr))
{ {
CL_ParsePrint(s+1, PRINT_CHAT); CL_ParsePrint(s+1, PRINT_CHAT);
@ -4310,6 +4323,8 @@ void CLNQ_ParseServerMessage (void)
} }
else else
{ {
// Plug_Message(0, PRINT_HIGH, s);
CL_ParsePrint(s, PRINT_HIGH); CL_ParsePrint(s, PRINT_HIGH);
CL_PrintStandardMessage(s); CL_PrintStandardMessage(s);
} }