Bring back ui fallback

etfdevs · May 5, 2024 · e1840e5 · e1840e5
1 parent 30b4aec
commit e1840e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/unix/unix_main.c b/src/unix/unix_main.c
@@ -832,7 +832,7 @@ void *Sys_LoadGameDll(const char *name, vmMain_t *entryPoint, dllSyscall_t syste
 
 	// Last resort for missing DLLs or media mods
 	// If mod requires a different cgame/ui this could cause problems
-	/*if ( !libHandle && strcmp( gamedir, BASEGAME ) != 0 )
+	if ( !libHandle && !strcmp( name, "ui" ) && strcmp( gamedir, BASEGAME ) != 0 )
 	{
 		const char *temp = va( "%s%c%s", gamedir, PATH_SEP, fname );
 		FS_SetFilterFlag( FS_EXCLUDE_OTHERGAMES );
@@ -845,7 +845,7 @@ void *Sys_LoadGameDll(const char *name, vmMain_t *entryPoint, dllSyscall_t syste
 				libHandle = try_dlopen(SEARCHPATH2, BASEGAME, fname);
 		}
 		FS_SetFilterFlag( 0 );
-	}*/
+	}
 
 	if (!libHandle)
 	{

diff --git a/src/win32/win_main.c b/src/win32/win_main.c
@@ -827,15 +827,15 @@ void *QDECL Sys_LoadGameDll( const char *name, vmMain_t *entryPoint, dllSyscall_
 
 	// Last resort for missing DLLs or media mods
 	// If mod requires a different cgame/ui this could cause problems
-	/*if ( !libHandle && strcmp( gamedir, BASEGAME ) != 0 ) {
+	if ( !libHandle && !strcmp( name, "ui" ) && strcmp( gamedir, BASEGAME ) != 0 ) {
 		const char *temp = va( "%s%c%s", gamedir, PATH_SEP, filename );
 		FS_SetFilterFlag( FS_EXCLUDE_OTHERGAMES );
 		if ( !FS_SV_FileExists( temp ) && !FS_FileIsInPAK( filename, NULL, NULL ) ) {
 			Com_Printf( "Sys_LoadDLL(%s/%s) trying %s override\n", gamedir, name, BASEGAME );
 			libHandle = try_dlopen(basepath, BASEGAME, filename);
 		}
 		FS_SetFilterFlag( 0 );
-	}*/
+	}
 
 	if ( !libHandle ) {
 #ifdef _DEBUG // in debug abort on failure