diff --git a/Classic/scripts/LateOverridesGame.cs b/Classic/scripts/LateOverridesGame.cs new file mode 100644 index 0000000..ebe6fde --- /dev/null +++ b/Classic/scripts/LateOverridesGame.cs @@ -0,0 +1,90 @@ +// LateOveridesGame.cs +// +// Created to overrides that need to be executed later in the server loading process. +// Sometimes this is necessary. +// + + +// autoexec/GetTeamCounts.cs Overrides +// Proper Overrides +// Events that determine a TeamGetCounts update +package TeamCountsTriggers +{ + +function DefaultGame::clientJoinTeam( %game, %client, %team, %respawn ) +{ + Parent::clientJoinTeam( %game, %client, %team, %respawn ); + + //Trigger GetCounts + ResetClientChangedTeams(); +} + +function DefaultGame::clientChangeTeam(%game, %client, %team, %fromObs, %respawned) +{ + Parent::clientChangeTeam(%game, %client, %team, %fromObs, %respawned); + + //Trigger GetCounts + ResetClientChangedTeams(); +} + +function DefaultGame::assignClientTeam(%game, %client, %respawn ) +{ + Parent::assignClientTeam(%game, %client, %respawn ); + + //Trigger GetCounts + ResetClientChangedTeams(); +} + +function DefaultGame::onClientEnterObserverMode( %game, %client ) +{ + Parent::onClientEnterObserverMode( %game, %client ); + + //Trigger GetCounts + ResetClientChangedTeams(); +} + +function DefaultGame::AIChangeTeam(%game, %client, %newTeam) +{ + Parent::AIChangeTeam(%game, %client, %newTeam); + + //Trigger GetCounts + ResetClientChangedTeams(); +} + +function DefaultGame::forceObserver(%game, %client, %reason) +{ + Parent::forceObserver(%game, %client, %reason); + + //Trigger GetCounts + ResetClientChangedTeams(); +} + +function GameConnection::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch) +{ + Parent::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch); + + //Reset GetCounts + ResetClientChangedTeams(); +} + +function DefaultGame::gameOver(%game) +{ + Parent::gameOver(%game); + + //Reset GetCounts + ResetClientChangedTeams(); +} + +function GameConnection::onDrop(%client, %reason) +{ + Parent::onDrop(%client, %reason); + + //Reset GetCounts + ResetClientChangedTeams(); +} + +}; + +// Prevent package from being activated if it is already +if (!isActivePackage(TeamCountsTriggers)) + activatePackage(TeamCountsTriggers); diff --git a/Classic/scripts/autoexec/GetTeamCounts.cs b/Classic/scripts/autoexec/GetTeamCounts.cs index 0e0fee4..8537422 100644 --- a/Classic/scripts/autoexec/GetTeamCounts.cs +++ b/Classic/scripts/autoexec/GetTeamCounts.cs @@ -82,85 +82,5 @@ function ResetClientChangedTeams() $GetCountsClientTeamChange = true; } -// Proper Overrides -// Events that determine a TeamGetCounts update -package TeamCountsTriggers -{ - -function DefaultGame::clientJoinTeam( %game, %client, %team, %respawn ) -{ - Parent::clientJoinTeam( %game, %client, %team, %respawn ); - - //Trigger GetCounts - ResetClientChangedTeams(); -} - -function DefaultGame::clientChangeTeam(%game, %client, %team, %fromObs, %respawned) -{ - Parent::clientChangeTeam(%game, %client, %team, %fromObs, %respawned); - - //Trigger GetCounts - ResetClientChangedTeams(); -} - -function DefaultGame::assignClientTeam(%game, %client, %respawn ) -{ - Parent::assignClientTeam(%game, %client, %respawn ); - - //Trigger GetCounts - ResetClientChangedTeams(); -} - -function DefaultGame::onClientEnterObserverMode( %game, %client ) -{ - Parent::onClientEnterObserverMode( %game, %client ); - - //Trigger GetCounts - ResetClientChangedTeams(); -} - -function DefaultGame::AIChangeTeam(%game, %client, %newTeam) -{ - Parent::AIChangeTeam(%game, %client, %newTeam); - - //Trigger GetCounts - ResetClientChangedTeams(); -} - -function DefaultGame::onClientLeaveGame(%game, %client) -{ - Parent::onClientLeaveGame(%game, %client); - - //Trigger GetCounts - ResetClientChangedTeams(); -} - -function DefaultGame::forceObserver(%game, %client, %reason) -{ - Parent::forceObserver(%game, %client, %reason); - - //Trigger GetCounts - ResetClientChangedTeams(); -} - -function GameConnection::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch) -{ - Parent::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch); - - //Reset GetCounts - ResetClientChangedTeams(); -} - -function DefaultGame::gameOver(%game) -{ - Parent::gameOver(%game); - - //Reset GetCounts - ResetClientChangedTeams(); -} - -}; - -// Prevent package from being activated if it is already -if (!isActivePackage(TeamCountsTriggers)) - activatePackage(TeamCountsTriggers); +// Overrides moved to Scripts/LateOverridesGame.cs +// Due to issues in reliability \ No newline at end of file