diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-08-01 20:35:04 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-08-02 02:51:25 +0300 |
| commit | fc765f5f146627d282b4374dd0c575895d64a900 (patch) | |
| tree | 25ec1f349984922938a0963a6b066b89021593d4 | |
| parent | df45dd254c4b26f3e0fdb140e370e532f626f8f1 (diff) | |
Fixed the drawing order of alien, human stages in spectator view.
Fixed the stage counters for stages 4 and 5.
Reset default values for human stage thresholds to half of what aliens got.
| -rw-r--r-- | src/cgame/cg_draw.c | 2 | ||||
| -rw-r--r-- | src/game/g_main.c | 8 | ||||
| -rw-r--r-- | src/game/tremulous.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 2ec205f..6af1375 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -1746,7 +1746,7 @@ static void CG_DrawStageReport( rectDef_t *rect, float text_x, float text_y, if( cg.snap->ps.stats[ STAT_TEAM ] == TEAM_NONE ) // return; { - Com_sprintf( s, MAX_TOKEN_CHARS, " %d [ye2]HUMANS |STAGE| ALIENS[Ye] %d ", cgs.humanStage + 1 , cgs.alienStage + 1); + Com_sprintf( s, MAX_TOKEN_CHARS, " %d [ye2]ALIENS |STAGE| HUMANS[Ye] %d ", cgs.alienStage + 1 , cgs.humanStage + 1); } diff --git a/src/game/g_main.c b/src/game/g_main.c index d123d96..45f7b03 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -1499,9 +1499,9 @@ void G_CalculateStages( void ) else if( g_alienStage.integer == S2 && g_alienMaxStage.integer > S2 ) alienNextStageThreshold = (int)( ceil( (float)g_alienStage3Threshold.integer * alienPlayerCountMod ) ); else if( g_alienStage.integer == S3 && g_alienMaxStage.integer > S3 ) - alienNextStageThreshold = (int)( ceil( (float)g_alienStage3Threshold.integer * alienPlayerCountMod ) ); + alienNextStageThreshold = (int)( ceil( (float)g_alienStage4Threshold.integer * alienPlayerCountMod ) ); else if( g_alienStage.integer == S4 && g_alienMaxStage.integer > S4 ) - alienNextStageThreshold = (int)( ceil( (float)g_alienStage3Threshold.integer * alienPlayerCountMod ) ); + alienNextStageThreshold = (int)( ceil( (float)g_alienStage5Threshold.integer * alienPlayerCountMod ) ); else alienNextStageThreshold = -1; @@ -1510,9 +1510,9 @@ void G_CalculateStages( void ) else if( g_humanStage.integer == S2 && g_humanMaxStage.integer > S2 ) humanNextStageThreshold = (int)( ceil( (float)g_humanStage3Threshold.integer * humanPlayerCountMod ) ); else if( g_humanStage.integer == S3 && g_humanMaxStage.integer > S3 ) - humanNextStageThreshold = (int)( ceil( (float)g_humanStage3Threshold.integer * humanPlayerCountMod ) ); + humanNextStageThreshold = (int)( ceil( (float)g_humanStage4Threshold.integer * humanPlayerCountMod ) ); else if( g_humanStage.integer == S4 && g_humanMaxStage.integer > S4 ) - humanNextStageThreshold = (int)( ceil( (float)g_humanStage3Threshold.integer * humanPlayerCountMod ) ); + humanNextStageThreshold = (int)( ceil( (float)g_humanStage5Threshold.integer * humanPlayerCountMod ) ); else humanNextStageThreshold = -1; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 92affa2..40c0823 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -45,10 +45,10 @@ TREMULOUS EDGE MOD SRC FILE #define DEFAULT_ALIEN_MAX_STAGE "4" #define DEFAULT_HUMAN_BUILDPOINTS "150" #define DEFAULT_HUMAN_QUEUE_TIME "8000" -#define DEFAULT_HUMAN_STAGE2_THRESH "6000" -#define DEFAULT_HUMAN_STAGE3_THRESH "12000" -#define DEFAULT_HUMAN_STAGE4_THRESH "18000" -#define DEFAULT_HUMAN_STAGE5_THRESH "24000" +#define DEFAULT_HUMAN_STAGE2_THRESH "3000" +#define DEFAULT_HUMAN_STAGE3_THRESH "6000" +#define DEFAULT_HUMAN_STAGE4_THRESH "9000" +#define DEFAULT_HUMAN_STAGE5_THRESH "12000" #define DEFAULT_HUMAN_MAX_STAGE "4" #define DAMAGE_FRACTION_FOR_KILL 0.5f //how much damage players (versus structures) need to #define MAXIMUM_BUILD_TIME 30000 // used for pie timer |