diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 11:47:23 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:21 +0000 |
| commit | 97e55ebf684547b2298df1c8c77f3902e3041bd4 (patch) | |
| tree | 3b847a467fc38e0d2590e2288c3de45f8cd01763 /src | |
| parent | 5651e55a8679bd84c0759eead6357c2c33583416 (diff) | |
* Grammatical tweaks to menu messages
* De-tabbing whitespace
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_servercmds.c | 8 | ||||
| -rw-r--r-- | src/game/bg_pmove.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index 4742eabe..43caae33 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -839,7 +839,7 @@ void CG_Menu( int menu, int arg ) break; case MN_A_CANTEVOLVE: - shortMsg = va( "You cannot evolve to %s", + shortMsg = va( "You cannot evolve into a %s", BG_ClassConfig( arg )->humanName ); type = DT_ARMOURYEVOLVE; break; @@ -855,19 +855,19 @@ void CG_Menu( int menu, int arg ) break; case MN_A_CLASSNOTSPAWN: - shortMsg = va( "You cannot spawn as %s", + shortMsg = va( "You cannot spawn as a %s", BG_ClassConfig( arg )->humanName ); type = DT_ARMOURYEVOLVE; break; case MN_A_CLASSNOTALLOWED: - shortMsg = va( "%s is not allowed", + shortMsg = va( "The %s is not allowed", BG_ClassConfig( arg )->humanName ); type = DT_ARMOURYEVOLVE; break; case MN_A_CLASSNOTATSTAGE: - shortMsg = va( "%s is not allowed at Stage %d", + shortMsg = va( "The %s is not allowed at Stage %d", BG_ClassConfig( arg )->humanName, cgs.alienStage + 1 ); type = DT_ARMOURYEVOLVE; diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index df5e5450..474d681b 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -559,7 +559,7 @@ static qboolean PM_CheckPounce( void ) ( pm->ps->pm_flags & PMF_CHARGE ) ) { pm->ps->pm_flags &= ~PMF_CHARGE; - pm->ps->weaponTime += LEVEL3_POUNCE_REPEAT; + pm->ps->weaponTime += LEVEL3_POUNCE_REPEAT; return qfalse; } @@ -2257,8 +2257,8 @@ static void PM_GroundTrace( void ) VectorMA( pm->ps->origin, 0.25f, movedir, point ); pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask ); - if( trace.fraction < 1.0f && - !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) ) + if( trace.fraction < 1.0f && + !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) ) { if( !VectorCompare( trace.plane.normal, pm->ps->grapplePoint ) ) { |