diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2011-02-14 10:47:49 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:59 +0000 |
| commit | 0ca5d9e96290ce89e3f07cc65252ef60d90d68fb (patch) | |
| tree | b2b22a24c12ee2674d92a712959ef2b5dc1f6982 /src | |
| parent | e0a39a125ba29d2851a7bcdecb520f77c3e68b43 (diff) | |
* Fix hud spectator text not displaying when using cg_stickyspec to follow a player who is not spawned
* Fix tutorial text from suggesting that a player spectating a teammate while dead can "return to free spectator mode"
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_tutorial.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c index c3069a1e..21db7774 100644 --- a/src/cgame/cg_tutorial.c +++ b/src/cgame/cg_tutorial.c @@ -582,18 +582,22 @@ static void CG_SpectatorText( char *text, playerState_t *ps ) Q_strcat( text, MAX_TUTORIAL_TEXT, va( "Press %s to switch to chase-cam spectator mode\n", CG_KeyNameForCommand( "+button2" ) ) ); - else + else if( cgs.clientinfo[ cg.clientNum ].team == TEAM_NONE ) Q_strcat( text, MAX_TUTORIAL_TEXT, va( "Press %s to return to free spectator mode\n", CG_KeyNameForCommand( "+button2" ) ) ); - - Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s or ", - CG_KeyNameForCommand( "weapprev" ) ) ); + else Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "%s to change player\n", - CG_KeyNameForCommand( "weapnext" ) ) ); - } + va( "Press %s to stop following\n", + CG_KeyNameForCommand( "+button2" ) ) ); + + Q_strcat( text, MAX_TUTORIAL_TEXT, + va( "Press %s or ", + CG_KeyNameForCommand( "weapprev" ) ) ); + Q_strcat( text, MAX_TUTORIAL_TEXT, + va( "%s to change player\n", + CG_KeyNameForCommand( "weapnext" ) ) ); + } else { Q_strcat( text, MAX_TUTORIAL_TEXT, |