Updated the SDK with the latest code from the TF and HL2 branches.

3 files changed, 7 insertions, 17 deletions

diff --git a/mp/src/game/client/game_controls/baseviewport.cpp b/mp/src/game/client/game_controls/baseviewport.cpp
index 0b99ef63..f239cde8 100644
--- a/mp/src/game/client/game_controls/baseviewport.cpp
+++ b/mp/src/game/client/game_controls/baseviewport.cpp
@@ -229,12 +229,11 @@ void CBaseViewport::CreateDefaultPanels( void )
 	AddNewPanel( CreatePanelByName( PANEL_SCOREBOARD ), "PANEL_SCOREBOARD" );
 	AddNewPanel( CreatePanelByName( PANEL_INFO ), "PANEL_INFO" );
 	AddNewPanel( CreatePanelByName( PANEL_SPECGUI ), "PANEL_SPECGUI" );
+#if !defined( TF_CLIENT_DLL )
 	AddNewPanel( CreatePanelByName( PANEL_SPECMENU ), "PANEL_SPECMENU" );
 	AddNewPanel( CreatePanelByName( PANEL_NAV_PROGRESS ), "PANEL_NAV_PROGRESS" );
-	// AddNewPanel( CreatePanelByName( PANEL_TEAM ), "PANEL_TEAM" );
-	// AddNewPanel( CreatePanelByName( PANEL_CLASS ), "PANEL_CLASS" );
-	// AddNewPanel( CreatePanelByName( PANEL_BUY ), "PANEL_BUY" );
-#endif
+#endif // !TF_CLIENT_DLL
+#endif // !_XBOX
 }
 
 void CBaseViewport::UpdateAllPanels( void )
diff --git a/mp/src/game/client/game_controls/teammenu.cpp b/mp/src/game/client/game_controls/teammenu.cpp
index c242c936..6b98afd7 100644
--- a/mp/src/game/client/game_controls/teammenu.cpp
+++ b/mp/src/game/client/game_controls/teammenu.cpp
@@ -190,6 +190,7 @@ void CTeamMenu::LoadMapPage( const char *mapName )
 	char mapRES[ MAX_PATH ];
 
 	char uilanguage[ 64 ];
+	uilanguage[0] = 0;
 	engine->GetUILanguage( uilanguage, sizeof( uilanguage ) );
 
 	Q_snprintf( mapRES, sizeof( mapRES ), "resource/maphtml/%s_%s.html", mapName, uilanguage );
diff --git a/mp/src/game/client/game_controls/vguitextwindow.cpp b/mp/src/game/client/game_controls/vguitextwindow.cpp
index 5cdc2532..3c641859 100644
--- a/mp/src/game/client/game_controls/vguitextwindow.cpp
+++ b/mp/src/game/client/game_controls/vguitextwindow.cpp
@@ -102,11 +102,7 @@ CTextWindow::CTextWindow(IViewPort *pViewPort) : Frame(NULL, PANEL_INFO	)
 	SetTitleBarVisible( false );
 
 	m_pTextMessage = new TextEntry( this, "TextMessage" );
-#if defined( ENABLE_CHROMEHTMLWINDOW )
 	m_pHTMLMessage = new CMOTDHTML( this,"HTMLMessage" );
-#else
-	m_pHTMLMessage = NULL;
-#endif
 	m_pTitleLabel  = new Label( this, "MessageTitle", "Message Title" );
 	m_pOK		   = new Button(this, "ok", "#PropertyDialog_OK");
 
@@ -165,7 +161,6 @@ void CTextWindow::ShowText( const char *text )
 
 void CTextWindow::ShowURL( const char *URL, bool bAllowUserToDisable )
 {
-#if defined( ENABLE_CHROMEHTMLWINDOW )
 	#ifdef _DEBUG
 		Msg( "CTextWindow::ShowURL( %s )\n", URL );
 	#endif
@@ -196,8 +191,6 @@ void CTextWindow::ShowURL( const char *URL, bool bAllowUserToDisable )
 	m_pHTMLMessage->SetVisible( true );
 	m_pHTMLMessage->OpenURL( URL, NULL );
 	m_bShownURL = true;
-
-#endif
 }
 
 void CTextWindow::ShowIndex( const char *entry )
@@ -286,9 +279,8 @@ void CTextWindow::Update( void )
 
 	m_pTitleLabel->SetText( m_szTitle );
 
-#if defined( ENABLE_CHROMEHTMLWINDOW )
-	m_pHTMLMessage->SetVisible( false );
-#endif
+	if ( m_pHTMLMessage )
+		m_pHTMLMessage->SetVisible( false );
 	m_pTextMessage->SetVisible( false );
 
 	if ( m_nContentType == TYPE_INDEX )
@@ -427,13 +419,11 @@ void CTextWindow::ShowPanel( bool bShow )
 		SetVisible( false );
 		SetMouseInputEnabled( false );
 
-#if defined( ENABLE_CHROMEHTMLWINDOW )
-		if ( m_bUnloadOnDismissal && m_bShownURL )
+		if ( m_bUnloadOnDismissal && m_bShownURL && m_pHTMLMessage )
 		{
 			m_pHTMLMessage->OpenURL( "about:blank", NULL );
 			m_bShownURL = false;
 		}
-#endif
 	}
 }