rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-26 22:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

No floating scores over dead bodies, triangles disabled, and no viewing

Browse source 
names of enemys just of teammates.
This commit is contained in:
Richard Allen 2002-03-04 20:50:59 +00:00
parent dbf1a727ac
commit a7f9fc6b33
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reaction/cgame/cg_draw.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.25 2002/03/04 20:50:59 jbravo
// No floating scores over dead bodies, triangles disabled, and no viewing
// names of enemys just of teammates.
//
// Revision 1.24 2002/03/04 19:28:21 jbravo
// Fixing follownames up as suggested in the forums.
//
@ -2281,6 +2285,12 @@ static void CG_DrawCrosshairNames( void ) {
return;
}
// JBravo: Lets not show player names of opponents
if (cgs.clientinfo[cg.clientNum].team != cgs.clientinfo[cg.crosshairClientNum].team &&
cgs.gametype >= GT_TEAM) {
return;
}
name = cgs.clientinfo[ cg.crosshairClientNum ].name;
#ifdef MISSIONPACK
color[3] *= 0.5f;
@ -2494,14 +2504,15 @@ static qboolean CG_DrawFollow( void ) {
CG_DrawBigString( 320 - 9 * 8, 24, "following", 1.0F );
// JBravo: if gametype >= team, append teamname to his name.
if ( cgs.gametype >= GT_TEAM ) {
team = cgs.clientinfo[ cg.snap->ps.clientNum ].team;
if (team == TEAM_RED) {
Com_sprintf (combinedName, sizeof(combinedName), "%s/Team 1",
cgs.clientinfo[ cg.snap->ps.clientNum ].name,
cgs.clientinfo[cg.snap->ps.clientNum].name);
} else {
Com_sprintf (combinedName, sizeof(combinedName), "%s/Team 2",
cgs.clientinfo[ cg.snap->ps.clientNum ].name,
cgs.clientinfo[cg.snap->ps.clientNum].name);
}
x = 0.5 * ( 640 - GIANT_WIDTH -16 * CG_DrawStrlen( combinedName ) );
CG_DrawStringExt( x, 40, combinedName, color, qtrue, qtrue, GIANT_WIDTH - 16, GIANT_HEIGHT - 16, 0 );

9
reaction/cgame/cg_effects.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.20 2002/03/04 20:50:59 jbravo
// No floating scores over dead bodies, triangles disabled, and no viewing
// names of enemys just of teammates.
//
// Revision 1.19 2002/01/24 14:20:53 jbravo
// Adding func_explosive and a few new surfaceparms
//
@ -393,6 +397,11 @@ void CG_ScorePlum( int client, vec3_t org, int score ) {
return;
}
// JBravo: and not in team based games
if (cgs.gametype >= GT_TEAM) {
return;
}
le = CG_AllocLocalEntity();
le->leFlags = 0;
le->leType = LE_SCOREPLUM;

9
reaction/cgame/cg_players.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.19 2002/03/04 20:50:59 jbravo
// No floating scores over dead bodies, triangles disabled, and no viewing
// names of enemys just of teammates.
//
// Revision 1.18 2002/03/02 15:37:55 makro
// Changed the 'breath' effect a bit (alpha+size).
//
@ -2192,6 +2196,11 @@ static void CG_PlayerSprites( centity_t *cent ) {
return;
}
// JBravo: no triangles over teammates.
if (cgs.gametype == GT_TEAMPLAY) {
return;
}
team = cgs.clientinfo[ cent->currentState.clientNum ].team;
if ( !(cent->currentState.eFlags & EF_DEAD) &&
cg.snap->ps.persistant[PERS_TEAM] == team &&