diff options
| author | Roman Tetelman <kevlarman@gmail.com> | 2009-10-03 12:18:29 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:50 +0000 |
| commit | da6e5c087e80781a18025d692b53e17dd91c6d66 (patch) | |
| tree | 66dcc3ce5459c73c246424a7d94e3cc7017cc8de /src/cgame | |
| parent | e8e306e2e8e57d7d612ad7c9cc70a0314ef1d58c (diff) | |
* Revert stagedowns (fixes #2)
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 27 | ||||
| -rw-r--r-- | src/cgame/cg_servercmds.c | 13 |
2 files changed, 10 insertions, 30 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 0eab8bef..7ec08054 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -1450,7 +1450,6 @@ static void CG_DrawStageReport( rectDef_t *rect, float text_x, float text_y, vec4_t color, float scale, int textalign, int textvalign, int textStyle ) { char s[ MAX_TOKEN_CHARS ]; - char *reward; float tx, ty; if( cg.intermissionStarted ) @@ -1465,19 +1464,14 @@ static void CG_DrawStageReport( rectDef_t *rect, float text_x, float text_y, if( kills < 0 ) kills = 0; - if( cgs.alienStage < S3 ) - reward = "next stage"; - else - reward = "enemy stagedown"; - if( cgs.alienNextStageThreshold < 0 ) Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d", cgs.alienStage + 1 ); else if( kills == 1 ) - Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, 1 kill for %s", - cgs.alienStage + 1, reward ); + Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, 1 kill for next stage", + cgs.alienStage + 1 ); else - Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, %d kills for %s", - cgs.alienStage + 1, kills, reward ); + Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, %d kills for next stage", + cgs.alienStage + 1, kills ); } else if( cg.snap->ps.stats[ STAT_TEAM ] == TEAM_HUMANS ) { @@ -1486,19 +1480,14 @@ static void CG_DrawStageReport( rectDef_t *rect, float text_x, float text_y, if( credits < 0 ) credits = 0; - if( cgs.humanStage < S3 ) - reward = "next stage"; - else - reward = "enemy stagedown"; - if( cgs.humanNextStageThreshold < 0 ) Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d", cgs.humanStage + 1 ); else if( credits == 1 ) - Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, 1 credit for %s", - cgs.humanStage + 1, reward ); + Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, 1 credit for next stage", + cgs.humanStage + 1 ); else - Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, %d credits for %s", - cgs.humanStage + 1, credits, reward ); + Com_sprintf( s, MAX_TOKEN_CHARS, "Stage %d, %d credits for next stage", + cgs.humanStage + 1, credits ); } CG_AlignText( rect, s, scale, 0.0f, 0.0f, textalign, textvalign, &tx, &ty ); diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index 8de4e198..ebfeb2de 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -236,11 +236,7 @@ static void CG_AnnounceAlienStageTransistion( stage_t from, stage_t to ) return; trap_S_StartLocalSound( cgs.media.alienStageTransition, CHAN_ANNOUNCER ); - if( to > from ) - CG_CenterPrint( "We have evolved!", 200, GIANTCHAR_WIDTH * 4 ); - else - CG_CenterPrint( "We have devolved!", 200, GIANTCHAR_WIDTH * 4 ); - + CG_CenterPrint( "We have evolved!", 200, GIANTCHAR_WIDTH * 4 ); } /* @@ -254,12 +250,7 @@ static void CG_AnnounceHumanStageTransistion( stage_t from, stage_t to ) return; trap_S_StartLocalSound( cgs.media.humanStageTransition, CHAN_ANNOUNCER ); - - if( to > from ) - CG_CenterPrint( "Reinforcements have arrived!", 200, GIANTCHAR_WIDTH * 4 ); - else - CG_CenterPrint( "Reinforcements have been withdrawn!", 200, GIANTCHAR_WIDTH * 4 ); - + CG_CenterPrint( "Reinforcements have arrived!", 200, GIANTCHAR_WIDTH * 4 ); } /* |