summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2011-04-19 07:31:20 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:18:05 +0000
commit98438cc3e7d32312bb52b413c12698b67b8cfeb0 (patch)
tree834234775762ec9ad96c108d3b17c38f03130e51
parent8bbb74559d1f6ae21ec780acf91c740bfea8a2a8 (diff)
* Allow display of weapon/class/upgrade icons on scoreboard when using noclip while spectating (thanks Teapot)
-rw-r--r--src/cgame/cg_main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 70d875e8..e3a6a0c6 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -1466,9 +1466,14 @@ static const char *CG_FeederItemText( int feederID, int index, int column, qhand
if( cg.intermissionStarted && CG_ClientIsReady( sp->client ) )
showIcons = qfalse;
- else if( cg.snap->ps.pm_type == PM_SPECTATOR || cg.snap->ps.pm_flags & PMF_FOLLOW ||
- team == cg.snap->ps.stats[ STAT_TEAM ] || cg.intermissionStarted )
+ else if( cg.snap->ps.pm_type == PM_SPECTATOR ||
+ cg.snap->ps.pm_type == PM_NOCLIP ||
+ cg.snap->ps.pm_flags & PMF_FOLLOW ||
+ team == cg.snap->ps.stats[ STAT_TEAM ] ||
+ cg.intermissionStarted )
+ {
showIcons = qtrue;
+ }
if( info && info->infoValid )
{