From 244808767a99cc237a477262420c43c126732088 Mon Sep 17 00:00:00 2001 From: Christopher Schwarz Date: Mon, 12 Oct 2009 18:49:20 +0000 Subject: * (bug 4301) Clear decon markers when entering sudden death (Rezyn) * Fix ability to call sudden death votes when regular entry to sudden death is disabled * Add sudden_death to the printed list of valid vote types * Fix AdvGranger abilities appearing in tutorial text for regular Granger --- src/cgame/cg_tutorial.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/cgame') diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c index 5a650d06..38dd52f4 100644 --- a/src/cgame/cg_tutorial.c +++ b/src/cgame/cg_tutorial.c @@ -222,23 +222,22 @@ static void CG_AlienBuilderText( char *text, playerState_t *ps ) } } - if( ps->stats[ STAT_CLASS ] == PCL_ALIEN_BUILDER0 || - ps->stats[ STAT_CLASS ] == PCL_ALIEN_BUILDER0_UPG ) + if( ( ps->stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) == BA_NONE ) { - if( ( ps->stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) == BA_NONE ) - { - Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s to swipe\n", - CG_KeyNameForCommand( "+button5" ) ) ); - } + Q_strcat( text, MAX_TUTORIAL_TEXT, + va( "Press %s to swipe\n", + CG_KeyNameForCommand( "+button5" ) ) ); + } + if( ps->stats[ STAT_CLASS ] == PCL_ALIEN_BUILDER0_UPG ) + { Q_strcat( text, MAX_TUTORIAL_TEXT, va( "Press %s to launch a projectile\n", - CG_KeyNameForCommand( "+button2" ) ) ); + CG_KeyNameForCommand( "+button2" ) ) ); Q_strcat( text, MAX_TUTORIAL_TEXT, va( "Press %s to walk on walls\n", - CG_KeyNameForCommand( "+movedown" ) ) ); + CG_KeyNameForCommand( "+movedown" ) ) ); } } -- cgit