From 28a23eaf11b2954548d84e45fb102420cff01246 Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Mon, 4 Apr 2016 10:50:49 +0200
Subject: [PATCH] Fix auto-assign entry in team menu to not show class
 selection.

---
 maps/mp/mods/disableClassMenu.gsc | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/maps/mp/mods/disableClassMenu.gsc b/maps/mp/mods/disableClassMenu.gsc
index e8a9f95..4f15fce 100644
--- a/maps/mp/mods/disableClassMenu.gsc
+++ b/maps/mp/mods/disableClassMenu.gsc
@@ -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();
+}
\ No newline at end of file