- undoing vbsp fix so I can branch it

sp/src/game/client/gstring/vgui/vgui_gstringmain.cpp

@@ -193,7 +193,7 @@ void CVGUIGstringMain::UpdateLayoutVisibility()
 	engine->GetScreenSize( w, t );
 
 	int menuHeight = t * 0.7f;
-	int menuWidth = menuHeight * 0.7f;
+	int menuWidth = menuHeight * 0.85f;
 
 	m_pWrappedMenu->SetBounds( w / 2 - menuWidth / 2,
 		t * 0.38f,

sp/src/game/client/gstring/vgui/vgui_menuembedded.cpp

@@ -183,6 +183,8 @@ void CVGUIMenuEmbedded::PerformLayout()
 	int w, t;
 	GetSize( w, t );
 
+	_line_offset = scheme()->GetProportionalScaledValue( 50 );
+
 	m_pTitle_0->SetBounds( 0, 0, w, _line_offset );
 	m_pTitle_1->SetBounds( 0, 0, w, _line_offset );
 
@@ -192,9 +194,9 @@ void CVGUIMenuEmbedded::PerformLayout()
 	activeButtons.AddVectorToTail( m_hButtons_General );
 	activeButtons.Sort( MenuButtonSort );
 
-	int button_size_y = scheme()->GetProportionalScaledValue( 17 );
+	int button_size_y = scheme()->GetProportionalScaledValue( 19 );
 	int button_size_x = w * 0.75f;
-	int button_offset_y = 15;
+	int button_offset_y = scheme()->GetProportionalScaledValue( 7 );
 	int cur_y = _line_offset + _line_size_y +
 		button_size_y;
 

sp/src/utils/common/utilmatlib.cpp

@@ -52,11 +52,6 @@ void LoadMaterialSystemInterface( CreateInterfaceFn fileSystemFactory )
 	{
 		Error( "Could not start the empty shader (shaderapiempty.dll)!" );
 	}
-
-	// loads game shader dlls from game directory
-	// i.e. allows you to use custom lightmapped shaders in hammer
-	// the respective call to ModShutdown() has been left out on purpose because it makes vbsp crash
-	g_pMaterialSystem->ModInit();
 }
 
 void InitMaterialSystem( const char *materialBaseDirPath, CreateInterfaceFn fileSystemFactory )

sp/src/vpc_scripts/groups.vgc

@@ -17,7 +17,7 @@ $Group "gstring"
 	"vgui_controls"
 	"mathlib"
 	"raytrace"
-	//"vbsp"
+	"vbsp"
 }
 
 $Group "gamedlls"