From 950c1363325a14f7a8f47558c9a41bf592340499 Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Mon, 4 Apr 2016 12:36:17 +0200
Subject: [PATCH] Renaming menu functions in disableClassMenu.gsc.

Avoids conflicts on import.
---
 maps/mp/mods/disableClassMenu.gsc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/maps/mp/mods/disableClassMenu.gsc b/maps/mp/mods/disableClassMenu.gsc
index b613a0f..3d8d702 100644
--- a/maps/mp/mods/disableClassMenu.gsc
+++ b/maps/mp/mods/disableClassMenu.gsc
@@ -7,16 +7,16 @@ disableClassMenu()
 	level.originalAllies = level.allies;
 	level.originalAxis = level.axis;
 	level.originalAutoAssign = level.autoAssign;
-	level.allies = ::menuAllies;
-	level.axis = ::menuAxis;
-	level.autoAssign = ::menuAutoAssign;
+	level.allies = ::classMenu_menuAllies;
+	level.axis = ::classMenu_menuAxis;
+	level.autoAssign = ::classMenu_menuAutoAssign;
 
 	game["menu_changeclass_axis"] = game["menu_team"];
 	game["menu_changeclass_allies"] = game["menu_team"];
 }
 
 
-autoClass()
+classMenu_autoClass()
 {
 	self closepopupMenu();
 	self closeInGameMenu();
@@ -25,29 +25,29 @@ autoClass()
 }
 
 
-menuAllies()
+classMenu_menuAllies()
 {
 	self [[level.originalAllies]]();
 
 	if (self.pers["team"] == "allies")
 	{
-		self autoClass();
+		self classMenu_autoClass();
 	}
 }
 
-menuAxis()
+classMenu_menuAxis()
 {
 	self [[level.originalAxis]]();
 
 	if (self.pers["team"] == "axis")
 	{
-		self autoClass();
+		self classMenu_autoClass();
 	}
 }
 
-menuAutoAssign()
+classMenu_menuAutoAssign()
 {
 	self [[level.originalAutoAssign]]();
 
-	self autoClass();
+	self classMenu_autoClass();
 }
\ No newline at end of file