diff --git a/mp/src/game/client/vgui_int.cpp b/mp/src/game/client/vgui_int.cpp index fb6d871fb..12cb50b66 100644 --- a/mp/src/game/client/vgui_int.cpp +++ b/mp/src/game/client/vgui_int.cpp @@ -24,6 +24,9 @@ #include "filesystem.h" #include "matsys_controls/matsyscontrols.h" +//Momentum +#include "momentum/ui/MapSelection/IMapSelector.h" + #ifdef SIXENSE #include "sixense/in_sixense.h" #endif @@ -195,6 +198,7 @@ bool VGui_Startup( CreateInterfaceFn appSystemFactory ) //----------------------------------------------------------------------------- void VGui_CreateGlobalPanels( void ) { + VPANEL gameMenu = enginevgui->GetPanel(PANEL_GAMEUIDLL); VPANEL gameToolParent = enginevgui->GetPanel( PANEL_CLIENTDLL_TOOLS ); VPANEL toolParent = enginevgui->GetPanel( PANEL_TOOLS ); #if defined( TRACK_BLOCKING_IO ) @@ -220,6 +224,9 @@ void VGui_CreateGlobalPanels( void ) #ifdef SIXENSE g_pSixenseInput->CreateGUI( gameToolParent ); #endif + + //Momentum + mapselector->Create(gameMenu); } void VGui_Shutdown() @@ -241,6 +248,9 @@ void VGui_Shutdown() loadingdisc->Destroy(); internalCenterPrint->Destroy(); + //Momentum + mapselector->Destroy(); + if ( g_pClientMode ) { g_pClientMode->VGui_Shutdown(); diff --git a/mp/src/lib/public/mathlib.lib b/mp/src/lib/public/mathlib.lib index 8917d1234..0c22ab75a 100644 Binary files a/mp/src/lib/public/mathlib.lib and b/mp/src/lib/public/mathlib.lib differ diff --git a/mp/src/lib/public/raytrace.lib b/mp/src/lib/public/raytrace.lib index 26a58dd49..030114d86 100644 Binary files a/mp/src/lib/public/raytrace.lib and b/mp/src/lib/public/raytrace.lib differ diff --git a/mp/src/lib/public/tier1.lib b/mp/src/lib/public/tier1.lib index 91ddcf5cc..378682f5e 100644 Binary files a/mp/src/lib/public/tier1.lib and b/mp/src/lib/public/tier1.lib differ diff --git a/mp/src/lib/public/vgui_controls.lib b/mp/src/lib/public/vgui_controls.lib index 4a0b5a774..de41ea91a 100644 Binary files a/mp/src/lib/public/vgui_controls.lib and b/mp/src/lib/public/vgui_controls.lib differ