diff options
| author | Tim Angus <tim@ngus.net> | 2007-09-23 23:38:58 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-09-23 23:38:58 +0000 |
| commit | 1f1e2bc11bcdacf8f35429595406790548d55b02 (patch) | |
| tree | 4c468fe42c63c1dc66f44073d87c374c0ece04b8 /src/cgame/cg_tutorial.c | |
| parent | 5cd5bc632499b503e0552345839c74236ef04856 (diff) | |
* Revert 898 and 899 (marked buildable replacement) and rewrite
Diffstat (limited to 'src/cgame/cg_tutorial.c')
| -rw-r--r-- | src/cgame/cg_tutorial.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c index ddc4cbcb..e5fc9eb5 100644 --- a/src/cgame/cg_tutorial.c +++ b/src/cgame/cg_tutorial.c @@ -195,31 +195,31 @@ static void CG_AlienBuilderText( char *text, playerState_t *ps ) Q_strcat( text, MAX_TUTORIAL_TEXT, va( "Press %s to build a structure\n", CG_KeyNameForCommand( "+attack" ) ) ); + } - if( ( es = CG_BuildableInRange( ps, NULL ) ) ) + if( ( es = CG_BuildableInRange( ps, NULL ) ) ) + { + if( cgs.markDeconstruct ) { - if( cgs.markDeconstruct ) + if( es->generic1 & B_MARKED_TOGGLEBIT ) { - if( es->generic1 & B_MARKED_TOGGLEBIT ) - { - Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s to unmark this structure\n", - CG_KeyNameForCommand( "deconstruct" ) ) ); - } - else - { - Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s to mark this structure\n", - CG_KeyNameForCommand( "deconstruct" ) ) ); - } + Q_strcat( text, MAX_TUTORIAL_TEXT, + va( "Press %s to unmark this structure\n", + CG_KeyNameForCommand( "deconstruct" ) ) ); } else { Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s to destroy this structure\n", + va( "Press %s to mark this structure\n", CG_KeyNameForCommand( "deconstruct" ) ) ); } } + else + { + Q_strcat( text, MAX_TUTORIAL_TEXT, + va( "Press %s to destroy this structure\n", + CG_KeyNameForCommand( "deconstruct" ) ) ); + } } if( ps->stats[ STAT_PCLASS ] == PCL_ALIEN_BUILDER0_UPG ) |