From 70cbb70398e2822d31e4132a4c5f8e76831cd258 Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Mon, 4 Apr 2016 10:54:36 +0200
Subject: [PATCH] Make use of the original auto-assign handler instead.

Reimplementing should be avoided when possible.
---
 maps/mp/mods/disableClassMenu.gsc | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/maps/mp/mods/disableClassMenu.gsc b/maps/mp/mods/disableClassMenu.gsc
index 5349d3c..b613a0f 100644
--- a/maps/mp/mods/disableClassMenu.gsc
+++ b/maps/mp/mods/disableClassMenu.gsc
@@ -6,6 +6,7 @@ disableClassMenu()
 {
 	level.originalAllies = level.allies;
 	level.originalAxis = level.axis;
+	level.originalAutoAssign = level.autoAssign;
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.autoAssign = ::menuAutoAssign;
@@ -46,34 +47,7 @@ menuAxis()
 
 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 [[level.originalAutoAssign]]();
 
 	self autoClass();
 }
\ No newline at end of file