From d1c5c322ed57864defb1b1560d9e012d4f55e1d9 Mon Sep 17 00:00:00 2001 From: zturtleman Date: Wed, 22 May 2019 00:13:39 +0000 Subject: [PATCH] Don't add points in domination after intermission starts. --- engine/code/game/g_main.c | 3 +++ engine/code/game/g_team.c | 17 +++++++++++++++++ engine/code/game/g_team.h | 3 +++ 3 files changed, 23 insertions(+) diff --git a/engine/code/game/g_main.c b/engine/code/game/g_main.c index 5c2c870f..090608a9 100644 --- a/engine/code/game/g_main.c +++ b/engine/code/game/g_main.c @@ -1241,6 +1241,9 @@ void BeginIntermission( void ) { // send the current scoring to all clients SendScoreboardMessageToAllClients(); +// Q3Rally Code Start + Team_EndGame(); +// Q3Rally Code END } diff --git a/engine/code/game/g_team.c b/engine/code/game/g_team.c index 08737d55..9bf024a6 100644 --- a/engine/code/game/g_team.c +++ b/engine/code/game/g_team.c @@ -98,6 +98,23 @@ void Team_InitGame( void ) { } } +// Q3Rally Code Start +void Team_EndGame( void ) { + // stop adding score when intermission starts + if ( g_gametype.integer == GT_DOMINATION ) { + if( teamgame.sigil[0].entity ) { + teamgame.sigil[0].entity->nextthink = 0; + } + if( teamgame.sigil[1].entity ) { + teamgame.sigil[1].entity->nextthink = 0; + } + if( teamgame.sigil[2].entity ) { + teamgame.sigil[2].entity->nextthink = 0; + } + } +} +// Q3Rally Code END + int OtherTeam(int team) { if (team==TEAM_RED) return TEAM_BLUE; diff --git a/engine/code/game/g_team.h b/engine/code/game/g_team.h index 5c72d50d..e13a80a7 100644 --- a/engine/code/game/g_team.h +++ b/engine/code/game/g_team.h @@ -77,6 +77,9 @@ void Team_DroppedFlagThink(gentity_t *ent); void Team_FragBonuses(gentity_t *targ, gentity_t *inflictor, gentity_t *attacker); void Team_CheckHurtCarrier(gentity_t *targ, gentity_t *attacker); void Team_InitGame(void); +// Q3Rally Code Start +void Team_EndGame(void); +// Q3Rally Code END void Team_ReturnFlag(int team); void Team_FreeEntity(gentity_t *ent); gentity_t *SelectCTFSpawnPoint ( team_t team, int teamstate, vec3_t origin, vec3_t angles, qboolean isbot );