diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:25:01 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:58 +0000 |
| commit | 5189226d1e8df1e56240d51a32d0db82924320d7 (patch) | |
| tree | fccc195f973841dfa5dad503421e01774b2c9f22 /src/cgame/cg_tutorial.c | |
| parent | 4b1bd2babe3c5b37648b987d16225d9f111205ce (diff) | |
* Spawn queue displays ordinals ("You are 2nd in the spawn queue")
* Server does not communicate the number of eggs and telenodes to all clients anymore -- the correct number of spawns is passed to the client when they are in the spawn queue only (puts PERS_UNUSED to use)
Sticky and dead spectate (holy fuck that was hard for something so simple sounding):
* Big thanks to Lakitu7 for passing along the patch (with contributions from TJW, Undeference, and R1CH)
* UI has a new option to enable/disable sticky spectate
* Spectators get to see the full dying animation
* Dead players can spectate their teammates whether they are in the spawn queue or not
I corrected several nasty bugs and recoded a LOT of the patch. Potentially the "spawn without a weapon" thing may have been fixed but maybe not. There are possibly other new bugs so keep an eye out for them.
Diffstat (limited to 'src/cgame/cg_tutorial.c')
| -rw-r--r-- | src/cgame/cg_tutorial.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c index b2abd7a5..04d0ec28 100644 --- a/src/cgame/cg_tutorial.c +++ b/src/cgame/cg_tutorial.c @@ -558,9 +558,14 @@ static void CG_SpectatorText( char *text, playerState_t *ps ) { if( cgs.clientinfo[ cg.clientNum ].team != PTE_NONE ) { - Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s to spawn\n", - CG_KeyNameForCommand( "+attack" ) ) ); + if( ps->pm_flags & PMF_QUEUED ) + Q_strcat( text, MAX_TUTORIAL_TEXT, + va( "Press %s to leave spawn queue\n", + CG_KeyNameForCommand( "+attack" ) ) ); + else + Q_strcat( text, MAX_TUTORIAL_TEXT, + va( "Press %s to spawn\n", + CG_KeyNameForCommand( "+attack" ) ) ); } else { |