Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-01-20 00:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Oops

Browse source 
Rogue CTFGame in SCtFGame.cs causing issues with CTFGame
This commit is contained in:
ChocoTaco1 2020-07-21 15:45:26 -04:00
parent 7266436bcd
commit 8a0e3d6a65
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Classic/scripts/SCtFGame.cs
View file

@ -1143,11 +1143,13 @@ function SCtFGame::beginStalemate(%game)
{ {
%game.stalemate = true; %game.stalemate = true;
%game.showStalemateTargets(); %game.showStalemateTargets();
// z0dd - ZOD, 5/27/03. Added anti-turtling, return flags after x minutes // z0dd - ZOD, 5/27/03. Added anti-turtling, return flags after x minutes
if(!$Host::TournamentMode) if(!$Host::TournamentMode)
{ {
messageAll( 'MsgStalemate', '\c3Anti turtle initialized. Flags will be returned to bases in %1 minutes.', $Host::ClassicAntiTurtleTime); messageAll( 'MsgStalemate', "\c3Anti turtle initialized. Flags will be returned to bases in " @ $Host::ClassicAntiTurtleTime @ " minutes.");
%game.turtleSchedule = %game.schedule($Host::ClassicAntiTurtleTime * 60000, 'antiTurtle'); %game.turtleSchedule = %game.schedule($Host::ClassicAntiTurtleTime * 60000, "antiTurtle");
error(formatTimeString("HH:nn:ss") SPC "Anti-Turtle thread beginning now - ID:" SPC %game.turtleSchedule);
} }
} }
@ -1156,19 +1158,28 @@ function SCtFGame::endStalemate(%game)
%game.stalemate = false; %game.stalemate = false;
%game.hideStalemateTargets(); %game.hideStalemateTargets();
cancel(%game.stalemateSchedule); cancel(%game.stalemateSchedule);
cancel(%game.turtleSchedule);
} }
// z0dd - ZOD, 5/27/03. Anti-turtle function function SCtFGame::antiTurtle(%game)
function CTFGame::antiTurtle(%game)
{ {
if(isEventPending(%game.turtleSchedule)) if(isEventPending(%game.turtleSchedule))
cancel(%game.turtleSchedule); cancel(%game.turtleSchedule);
for (%i = 1; %i <= 2; %i++) if(%game.turtleSchedule > 0)
{ %game.turtleSchedule = 0;
if(isEventPending(%game.stalemateSchedule))
cancel(%game.stalemateSchedule);
if(%game.stalemateSchedule > 0)
%game.stalemateSchedule = 0;
for (%i = 1; %i <= Game.numTeams; %i++)
Game.flagReturn($TeamFlag[%i]); Game.flagReturn($TeamFlag[%i]);
messageAll( 'MsgCTFFlagReturned', '\c3Both flags returned to bases to break stalemate.~wfx/misc/flag_return.wav', 0, 0, %i);
} messageAll( "", "\c3Both flags returned to bases to break stalemate.~wfx/misc/flag_return.wav");
error(formatTimeString("HH:nn:ss") SPC "Anti-Turtle thread ended");
} }
function SCtFGame::flagReset(%game, %flag) function SCtFGame::flagReset(%game, %flag)