rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-30 07:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dead people cant speak to the living any more.

Browse source
This commit is contained in:
Richard Allen 2002-02-26 01:10:19 +00:00
parent 0ddc32ad4e
commit d438579604
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.56 2002/02/26 01:10:19 jbravo
// Dead people cant speak to the living any more.
//
// Revision 1.55 2002/02/25 19:41:53 jbravo // Revision 1.55 2002/02/25 19:41:53 jbravo
// Fixed the use ESC and join menu to join teams when dead players are // Fixed the use ESC and join menu to join teams when dead players are
// spectating in TP mode. // spectating in TP mode.
@ -996,7 +999,7 @@ G_Say
================== ==================
*/ */
static void G_SayTo( gentity_t *ent, gentity_t *other, int mode, int color, const char *name, const char *message ) { static void G_SayTo(gentity_t *ent, gentity_t *other, int mode, int color, const char *name, const char *message) {
if (!other) { if (!other) {
return; return;
} }
@ -1018,6 +1021,13 @@ static void G_SayTo( gentity_t *ent, gentity_t *other, int mode, int color, cons
&& ent->client->sess.sessionTeam != TEAM_FREE ) { && ent->client->sess.sessionTeam != TEAM_FREE ) {
return; return;
} }
// JBravo: Dead people dont speak to the living... or so Im told.
if (ent->client->sess.sessionTeam == TEAM_SPECTATOR &&
(other->client->sess.sessionTeam == TEAM_RED ||
other->client->sess.sessionTeam == TEAM_BLUE) &&
g_gametype.integer == GT_TEAMPLAY) {
return;
}
trap_SendServerCommand( other-g_entities, va("%s \"%s%c%c%s\"", trap_SendServerCommand( other-g_entities, va("%s \"%s%c%c%s\"",
mode == SAY_TEAM ? "tchat" : "chat", mode == SAY_TEAM ? "tchat" : "chat",
@ -1081,12 +1091,13 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText )
break; break;
case SAY_TEAM: case SAY_TEAM:
if (ent->client->sess.sessionTeam == TEAM_SPECTATOR) { if (ent->client->sess.sessionTeam == TEAM_SPECTATOR) {
if (Team_GetLocationMsg(ent, location, sizeof(location))) if (Team_GetLocationMsg(ent, location, sizeof(location))) {
Com_sprintf (name, sizeof(name), EC"[DEAD] (%s%c%c"EC") (%s)"EC": ", Com_sprintf (name, sizeof(name), EC"[DEAD] (%s%c%c"EC") (%s)"EC": ",
ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE, location); ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE, location);
else } else {
Com_sprintf (name, sizeof(name), EC"[DEAD] (%s%c%c"EC")"EC": ", Com_sprintf (name, sizeof(name), EC"[DEAD] (%s%c%c"EC")"EC": ",
ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE ); ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE );
}
G_LogPrintf( "[DEAD] (%s): %s\n", ent->client->pers.netname, chatText ); G_LogPrintf( "[DEAD] (%s): %s\n", ent->client->pers.netname, chatText );
} else { } else {
if (Team_GetLocationMsg(ent, location, sizeof(location))) if (Team_GetLocationMsg(ent, location, sizeof(location)))
@ -1116,8 +1127,8 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText )
Q_strncpyz( text, chatText, sizeof(text) ); Q_strncpyz( text, chatText, sizeof(text) );
if ( target ) { if (target) {
G_SayTo( ent, target, mode, color, name, text ); G_SayTo(ent, target, mode, color, name, text);
return; return;
} }
@ -1129,7 +1140,7 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText )
// send it to all the apropriate clients // send it to all the apropriate clients
for (j = 0; j < level.maxclients; j++) { for (j = 0; j < level.maxclients; j++) {
other = &g_entities[j]; other = &g_entities[j];
G_SayTo( ent, other, mode, color, name, text ); G_SayTo(ent, other, mode, color, name, text);
} }
} }