Fix auto-assign entry in team menu to not show class selection.

master
Icedream 2016-04-04 10:50:49 +02:00
parent 5dc86d2a43
commit 28a23eaf11
1 changed files with 36 additions and 0 deletions

View File

@ -8,6 +8,8 @@ disableClassMenu()
level.originalAxis = level.axis;
level.allies = ::menuAllies;
level.axis = ::menuAxis;
level.autoAssign = ::menuAutoAssign;
}
@ -39,3 +41,37 @@ menuAxis()
self autoClass();
}
}
menuAutoAssign()
{
self closeMenus();
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();
}