Make use of the original auto-assign handler instead.
Reimplementing should be avoided when possible.master
parent
1222ef59e6
commit
70cbb70398
|
@ -6,6 +6,7 @@ disableClassMenu()
|
||||||
{
|
{
|
||||||
level.originalAllies = level.allies;
|
level.originalAllies = level.allies;
|
||||||
level.originalAxis = level.axis;
|
level.originalAxis = level.axis;
|
||||||
|
level.originalAutoAssign = level.autoAssign;
|
||||||
level.allies = ::menuAllies;
|
level.allies = ::menuAllies;
|
||||||
level.axis = ::menuAxis;
|
level.axis = ::menuAxis;
|
||||||
level.autoAssign = ::menuAutoAssign;
|
level.autoAssign = ::menuAutoAssign;
|
||||||
|
@ -46,34 +47,7 @@ menuAxis()
|
||||||
|
|
||||||
menuAutoAssign()
|
menuAutoAssign()
|
||||||
{
|
{
|
||||||
self closeMenus();
|
self [[level.originalAutoAssign]]();
|
||||||
|
|
||||||
assignment = getTeamAssignment();
|
|
||||||
|
|
||||||
if (isDefined(self.pers["team"]) && (self.sessionstate == "playing" || self.sessionstate == "dead"))
|
|
||||||
{
|
|
||||||
if (assignment == self.pers["team"])
|
|
||||||
{
|
|
||||||
self beginClassChoice();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
self.switching_teams = true;
|
|
||||||
self.joining_team = assignment;
|
|
||||||
self.leaving_team = self.pers["team"];
|
|
||||||
self suicide();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
self addToTeam(assignment);
|
|
||||||
self.pers["class"] = undefined;
|
|
||||||
self.class = undefined;
|
|
||||||
|
|
||||||
if (!isAlive(self))
|
|
||||||
self.statusicon = "hud_status_dead";
|
|
||||||
|
|
||||||
self notify("end_respawn");
|
|
||||||
|
|
||||||
self autoClass();
|
self autoClass();
|
||||||
}
|
}
|
Loading…
Reference in New Issue