Skip to content

Commit 84b16ad

Browse files
committed
feat: remove arrows
Signed-off-by: Michael Pollind <mpollind@gmail.com>
1 parent 994ef7a commit 84b16ad

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

source/cgame/cg_hud.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,12 +2350,6 @@ static bool CG_LFuncDrawHelpMessage( struct cg_layoutnode_s *commandnode, struct
23502350
return true;
23512351
}
23522352

2353-
static bool CG_LFuncDrawTeamMates( struct cg_layoutnode_s *commandnode, struct cg_layoutnode_s *argumentnode, int numArguments )
2354-
{
2355-
CG_DrawTeamMates();
2356-
return true;
2357-
}
2358-
23592353
static bool CG_LFuncDrawDamageNumbers( struct cg_layoutnode_s *commandnode, struct cg_layoutnode_s *argumentnode, int numArguments ) {
23602354
CG_DrawDamageNumbers();
23612355
return true;
@@ -3238,16 +3232,6 @@ static const cg_layoutcommand_t cg_LayoutCommands[] =
32383232
"Draws the name of the player in the crosshair",
32393233
false
32403234
},
3241-
3242-
{
3243-
"drawTeamMates",
3244-
CG_LFuncDrawTeamMates,
3245-
NULL,
3246-
0,
3247-
"Draws indicators where team mates are",
3248-
false
3249-
},
3250-
32513235
{
32523236
"drawDamageNumbers",
32533237
CG_LFuncDrawDamageNumbers,

source/cgame/cg_pmodels.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
3232

3333
pmodel_t cg_entPModels[MAX_EDICTS];
3434
pmodelinfo_t *cg_PModelInfos;
35+
static cvar_t *cg_showTeamMates;
3536

3637
//======================================================================
3738
// PlayerModel Registering
@@ -42,6 +43,7 @@ pmodelinfo_t *cg_PModelInfos;
4243
*/
4344
void CG_PModelsInit( void )
4445
{
46+
cg_showTeamMates = trap_Cvar_Get( "cg_showTeamMates", "1", CVAR_ARCHIVE );
4547
memset( cg_entPModels, 0, sizeof( cg_entPModels ) );
4648
}
4749

@@ -1304,7 +1306,7 @@ void CG_AddPModel( centity_t *cent )
13041306
{
13051307
CG_AddCentityOutLineEffect( cent );
13061308

1307-
if( cent->current.team == cg.predictedPlayerState.stats[STAT_TEAM] ) {
1309+
if( cent->current.team == cg.predictedPlayerState.stats[STAT_TEAM] && cg_showTeamMates->integer) {
13081310
vec4_t color;
13091311
CG_TeamColor( cg.predictedPlayerState.stats[STAT_TEAM], color );
13101312
cent->ent.outlineColorGhost[0] = color[0] * 255.0f;

source/cgame/cg_screen.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,9 +863,8 @@ void CG_DrawPlayerNames( struct qfontface_s *font, vec4_t color )
863863
}
864864
}
865865

866-
/*
867-
* CG_DrawTeamMates
868-
*/
866+
// ref: https://github.com/TeamForbiddenLLC/warfork-qfusion/pull/395
867+
// Note: replaced with player outline
869868
void CG_DrawTeamMates( void )
870869
{
871870
centity_t *cent;

0 commit comments

Comments
 (0)