mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-07-16 00:24:35 +00:00
No Change to Def WarmupTime if Disabled
Allow switching before match even when disabled
This commit is contained in:
parent
d97261b5b8
commit
6281639e80
1 changed files with 7 additions and 4 deletions
|
|
@ -19,9 +19,12 @@ package altWarmup
|
||||||
|
|
||||||
function DefaultGame::setupClientTeams(%game)
|
function DefaultGame::setupClientTeams(%game)
|
||||||
{
|
{
|
||||||
$Host::warmupTime = $AW::DefaultWarmUpTime;
|
if($AW::EnableALTWarmUp)
|
||||||
if($HostGamePlayerCount >= $AW::MinALTWarmUpPop && $AW::EnableALTWarmUp && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
|
{
|
||||||
%altWarmup = 1;
|
$Host::warmupTime = $AW::DefaultWarmUpTime;
|
||||||
|
if($HostGamePlayerCount >= $AW::MinALTWarmUpPop && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
|
||||||
|
%altWarmup = 1;
|
||||||
|
}
|
||||||
|
|
||||||
if(%altWarmup)
|
if(%altWarmup)
|
||||||
{
|
{
|
||||||
|
|
@ -60,7 +63,7 @@ function serverCmdClientJoinTeam(%client, %team, %admin)
|
||||||
{
|
{
|
||||||
if(%client.team != %team)
|
if(%client.team != %team)
|
||||||
{
|
{
|
||||||
if(!$MatchStarted && $AW::EnableALTWarmUp)
|
if(!$MatchStarted)
|
||||||
{
|
{
|
||||||
if(!%client.waitStart || (getSimTime() - %client.waitStart) > 5000 || %client.isAdmin)
|
if(!%client.waitStart || (getSimTime() - %client.waitStart) > 5000 || %client.isAdmin)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue