Merge pull request #97 from fortressforever/cleanup/map-guides

Remove the map guide menu as it has never been utilized
fortressforever · Dec 15, 2014 · 17bd3f5 · 17bd3f5
2 parents 376e0e0 + f523bf4
commit 17bd3f5
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 380 deletions.
diff --git a/cl_dll/client_scratch-2005.vcproj b/cl_dll/client_scratch-2005.vcproj
@@ -5422,14 +5422,6 @@
 						RelativePath=".\entity_client_tools.cpp"
 						>
 					</File>
-					<File
-						RelativePath=".\game_controls\mapguidemenu.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\game_controls\mapguidemenu.h"
-						>
-					</File>
 					<File
 						RelativePath="game_controls\MapOverview.cpp"
 						>

diff --git a/cl_dll/game_controls/baseviewport.cpp b/cl_dll/game_controls/baseviewport.cpp
@@ -42,7 +42,6 @@
 #include "hud.h"
 #include "NavProgress.h"
 #include "classmenu.h"
-#include "mapguidemenu.h"
 
 // our definition
 #include "baseviewport.h"
@@ -176,7 +175,6 @@ void CBaseViewport::CreateDefaultPanels( void )
 	// --> Mirv: FF panels
 	AddNewPanel(CreatePanelByName(PANEL_TEAM));
 	AddNewPanel(CreatePanelByName(PANEL_CLASS));
-	AddNewPanel(CreatePanelByName(PANEL_MAPGUIDE));
 	AddNewPanel(CreatePanelByName(PANEL_MAP));
 	// <--
 #endif
@@ -241,10 +239,6 @@ IViewPortPanel* CBaseViewport::CreatePanelByName(const char *szPanelName)
 	{
 		newpanel = new CClassMenu(this);
 	}
-	else if (Q_strcmp(PANEL_MAPGUIDE, szPanelName) == 0)
-	{
-		newpanel = new CMapGuideMenu(this);
-	}
 	else if (Q_strcmp(PANEL_MAP, szPanelName) == 0)
 	{
 		newpanel = new CMapScreen(this);

diff --git a/cl_dll/game_controls/mapguidemenu.cpp b/cl_dll/game_controls/mapguidemenu.cpp
diff --git a/cl_dll/game_controls/mapguidemenu.h b/cl_dll/game_controls/mapguidemenu.h
diff --git a/cl_dll/game_controls/teammenu.cpp b/cl_dll/game_controls/teammenu.cpp
@@ -230,7 +230,7 @@ CTeamMenu::CTeamMenu(IViewPort *pViewPort) : BaseClass(NULL, PANEL_TEAM)
 
 	m_pAutoAssignButton = new FFButton(this, "AutoAssignButton", (const char *) NULL, this, "AutoAssign");
 	m_pSpectateButton = new FFButton(this, "SpectateButton", (const char *) NULL, this, "Spectate");
-	m_pFlythroughButton = new FFButton(this, "FlythroughButton", (const char *) NULL, this, "mapguide overview");
+	m_pFlythroughButton = new FFButton(this, "FlythroughButton", (const char *) NULL, this, "mapguide");
 
 	m_pMapScreenshotButton = new FFButton(this, "MapScreenshotButton", (const char *) NULL, this, "MapShot");