engine: client: fixed checking client library for vgui_support interface export

engine/client/cl_scrn.c

@@ -781,6 +781,7 @@ SCR_VidInit
 */
 void SCR_VidInit( void )
 {
+	string libpath;
 	if( !ref.initialized ) // don't call VidInit too soon
 		return;
 
@@ -795,7 +796,8 @@ void SCR_VidInit( void )
 		gameui.globals->scrHeight = refState.height;
 	}
 
-	VGui_Startup( NULL, refState.width, refState.height ); // initialized already, so pass NULL
+	COM_GetCommonLibraryPath( LIBRARY_CLIENT, libpath, sizeof( libpath ));
+	VGui_Startup( libpath, refState.width, refState.height );
 
 	CL_ClearSpriteTextures(); // now all hud sprites are invalid
 

engine/client/vgui/vgui_draw.c

@@ -152,7 +152,6 @@ void VGui_Startup( const char *clientlib, int width, int height )
 
 		VGui_FillAPIFromRef( &vgui, &ref.dllFuncs );
 
-#ifdef XASH_INTERNAL_GAMELIBS
 		s_pVGuiSupport = COM_LoadLibrary( clientlib, false, false );
 
 		if( s_pVGuiSupport )
@@ -162,58 +161,57 @@ void VGui_Startup( const char *clientlib, int width, int height )
 			{
 				F( &vgui );
 				vgui.initialized = true;
-				VGUI_InitCursors();
+				Con_Reportf( "vgui_support: found internal client support\n" );
-				Con_Reportf( "vgui_support: found interal client support\n" );
 			}
 		}
-#endif // XASH_INTERNAL_GAMELIBS
 
-		// HACKHACK: load vgui with correct path first if specified.
+		if( !vgui.initialized )
-		// it will be reused while resolving vgui support and client deps
-		if( Sys_GetParmFromCmdLine( "-vguilib", vguilib ) )
 		{
-			if( Q_strstr( vguilib, ".dll") )
+			// HACKHACK: load vgui with correct path first if specified.
-				Q_strncpy( vguiloader, "vgui_support.dll", 256 );
+			// it will be reused while resolving vgui support and client deps
-			else
+			if( Sys_GetParmFromCmdLine( "-vguilib", vguilib ))
-				Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, 256 );
+			{
+				if( Q_strstr( vguilib, ".dll" ))
+					Q_strncpy( vguiloader, "vgui_support.dll", 256 );
+				else
+					Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, 256 );
 
-			if( !COM_LoadLibrary( vguilib, false, false ) )
+				if( !COM_LoadLibrary( vguilib, false, false ))
-				Con_Reportf( S_WARN "VGUI preloading failed. Default library will be used! Reason: %s\n", COM_GetLibraryError());
+					Con_Reportf( S_WARN "VGUI preloading failed. Default library will be used! Reason: %s\n", COM_GetLibraryError() );
-		}
+			}
 
-		if( Q_strstr( clientlib, ".dll" ) )
+			if( Q_strstr( clientlib, ".dll" ))
-			Q_strncpy( vguiloader, "vgui_support.dll", 256 );
+				Q_strncpy( vguiloader, "vgui_support.dll", 256 );
 
-		if( !vguiloader[0] && !Sys_GetParmFromCmdLine( "-vguiloader", vguiloader ) )
+			if( !vguiloader[0] && !Sys_GetParmFromCmdLine( "-vguiloader", vguiloader ))
-			Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, 256 );
+				Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, 256 );
 
-		s_pVGuiSupport = COM_LoadLibrary( vguiloader, false, false );
+			s_pVGuiSupport = COM_LoadLibrary( vguiloader, false, false );
 
-		if( !s_pVGuiSupport )
+			if( !s_pVGuiSupport )
-		{
+			{
-			s_pVGuiSupport = COM_LoadLibrary( va( "../%s", vguiloader ), false, false );
+				s_pVGuiSupport = COM_LoadLibrary( va( "../%s", vguiloader ), false, false );
-		}
+			}
 
-		if( !s_pVGuiSupport )
+			if( !s_pVGuiSupport )
-		{
-			if( FS_FileExists( vguiloader, false ) )
-				Con_Reportf( S_ERROR  "Failed to load vgui_support library: %s\n", COM_GetLibraryError() );
-			else
-				Con_Reportf( "vgui_support: not found\n" );
-		}
-		else
-		{
-			F = COM_GetProcAddress( s_pVGuiSupport, "InitAPI" );
-			if( F )
 			{
-				F( &vgui );
+				if( FS_FileExists( vguiloader, false ))
-				vgui.initialized = true;
+					Con_Reportf( S_ERROR "Failed to load vgui_support library: %s\n", COM_GetLibraryError() );
-				VGUI_InitCursors();
+				else
+					Con_Reportf( "vgui_support: not found\n" );
 			}
 			else
-				Con_Reportf( S_ERROR  "Failed to find vgui_support library entry point!\n" );
+			{
+				F = COM_GetProcAddress( s_pVGuiSupport, "InitAPI" );
+				if( F )
+				{
+					F( &vgui );
+					vgui.initialized = true;
+				}
+				else
+					Con_Reportf( S_ERROR "Failed to find vgui_support library entry point!\n" );
+			}
 		}
-
 	}
 
 	if( height < 480 )