From ccf01e22f535e9788f625667896adf2aa4751740 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Wed, 18 Nov 2020 16:24:32 -0500 Subject: [PATCH] Added Back --- Classic/scripts/LakRabbitGame.cs | 1 + Classic/scripts/autoexec/altWarmup.cs | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index 74eaff2..8f7e06b 100644 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -2012,6 +2012,7 @@ function LakRabbitGame::gameOver(%game) //Put everyone in observer //Mainly for switching to CTF + %client.team = 0; %client.lastTeam = 0; } diff --git a/Classic/scripts/autoexec/altWarmup.cs b/Classic/scripts/autoexec/altWarmup.cs index bd79cc1..7a7143d 100644 --- a/Classic/scripts/autoexec/altWarmup.cs +++ b/Classic/scripts/autoexec/altWarmup.cs @@ -31,6 +31,7 @@ function DefaultGame::setupClientTeams(%game) %client = ClientGroup.getObject(%i); //Put everyone in observer + %client.team = 0; %client.lastTeam = 0; } } @@ -114,6 +115,23 @@ function serverCmdClientJoinTeam(%client, %team, %admin) } } +// So flag snatch sound wont play at the end of the match +function CTFGame::playerTouchEnemyFlag(%game, %player, %flag) +{ + if(!$missionRunning) + return; + + parent::playerTouchEnemyFlag(%game, %player, %flag); +} + +function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag) +{ + if(!$missionRunning) + return; + + parent::playerTouchEnemyFlag(%game, %player, %flag); +} + }; // Prevent package from being activated if it is already