rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-04-04 17:02:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Spectators can now use say_team to communicate among each others, DM and TP

Browse source
This commit is contained in:
Daniel Simoes 2002-06-21 00:05:55 +00:00
parent 744a4bab1b
commit 5e70abd90a
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reaction/ChangeLog
View file

@ -23,4 +23,5 @@
* Added $P for last damaged player
* Fixed a model bug for team 2
* changed g_RQ3_printOwnObits to g_RQ3_showOwnKills and made it control what $K does
* Spectators can now use say_team to communicate among each others, DM and TP

36
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.139 2002/06/21 00:05:55 slicer
// Spectators can now use say_team to communicate among each others, DM and TP
//
// Revision 1.138 2002/06/20 22:32:43 jbravo
// Added last damaged player and fixed a test2 model problem (atrimum my ass :)
// Changed g_RQ3_printOwnObits to g_RQ3_showOwnKills and it also controls $K
@ -1387,16 +1390,26 @@ void G_Say(gentity_t * ent, gentity_t * target, int mode, const char *chatText)
return;
}
if (g_gametype.integer < GT_TEAM && mode == SAY_TEAM) {
mode = SAY_ALL;
}
// Slicer: DM now has [SPECTATOR]
// if (g_gametype.integer < GT_TEAM && mode == SAY_TEAM) {
// mode = SAY_ALL;
// }
// JBravo: adding below the [DEAD] tag infront of dead players names.
switch (mode) {
default:
case SAY_ALL:
if (ent->client->sess.sessionTeam == TEAM_SPECTATOR) {
Com_sprintf(name, sizeof(name), "[DEAD] %s%c%c" EC ": ", ent->client->pers.netname,
if(g_gametype.integer < GT_TEAM) // DM, SPECTATOR
Com_sprintf(name, sizeof(name), "[SPECTATOR] %s%c%c" EC ": ", ent->client->pers.netname,
Q_COLOR_ESCAPE, COLOR_WHITE);
else {
if(ent->client->sess.savedTeam == TEAM_SPECTATOR)
Com_sprintf(name, sizeof(name), "[SPECTATOR] %s%c%c" EC ": ", ent->client->pers.netname,
Q_COLOR_ESCAPE, COLOR_WHITE);
else
Com_sprintf(name, sizeof(name), "[DEAD] %s%c%c" EC ": ", ent->client->pers.netname,
Q_COLOR_ESCAPE, COLOR_WHITE);
}
} else {
Com_sprintf(name, sizeof(name), "%s%c%c" EC ": ", ent->client->pers.netname, Q_COLOR_ESCAPE,
COLOR_WHITE);
@ -1405,8 +1418,17 @@ void G_Say(gentity_t * ent, gentity_t * target, int mode, const char *chatText)
break;
case SAY_TEAM:
if (ent->client->sess.sessionTeam == TEAM_SPECTATOR) {
Com_sprintf(name, sizeof(name), EC "[DEAD] (%s%c%c" EC ")" EC ": ",
if(g_gametype.integer < GT_TEAM) // DM, SPECTATOR
Com_sprintf(name, sizeof(name), EC "[SPECTATOR] (%s%c%c" EC ")" EC ": ",
ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE);
else {
if(ent->client->sess.savedTeam == TEAM_SPECTATOR)
Com_sprintf(name, sizeof(name), EC "[SPECTATOR] (%s%c%c" EC ")" EC ": ",
ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE);
else
Com_sprintf(name, sizeof(name), EC "[DEAD] (%s%c%c" EC ")" EC ": ",
ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE);
}
} else {
if (Team_GetLocationMsg(ent, location, sizeof(location)))
Com_sprintf(name, sizeof(name), EC "(%s%c%c" EC ") (%s)" EC ": ",
@ -1502,6 +1524,10 @@ static void Cmd_Tell_f(gentity_t * ent)
return;
}
//Slicer : no TELL FOR TP
if(!g_gametype.integer < GT_TEAM)
return;
trap_Argv(1, arg, sizeof(arg));
targetNum = atoi(arg);
if (targetNum < 0 || targetNum >= level.maxclients) {