id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-02-27 22:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added custom content support by looking for all content in all maps/*.resources.

Browse source 
This changes the filesystem to work a bit more like previous id tech
engines and allows to run mods and custom content like the Wulfen high
resolution textures in those mods with

+set fs_game <modname> +set fs_resourceLoadPriority 0
This commit is contained in:
Robert Beckebans 2014-05-14 22:32:34 +02:00
parent 26bb497b3c
commit ee09662c10
1 changed files with 53 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
neo/framework/FileSystem.cpp
View file

@ -726,10 +726,14 @@ void idFileSystemLocal::UnloadMapResources( const char* name )
return; return;
} }
// RB: don't
/*
if( resourceFiles.Num() > 0 ) if( resourceFiles.Num() > 0 )
{ {
RemoveMapResourceFile( va( "%s.resources", name ) ); RemoveMapResourceFile( va( "%s.resources", name ) );
} }
*/
// RB end
} }
/* /*
@ -2654,9 +2658,14 @@ idFileSystemLocal::Path_f
void idFileSystemLocal::Path_f( const idCmdArgs& args ) void idFileSystemLocal::Path_f( const idCmdArgs& args )
{ {
common->Printf( "Current search path:\n" ); common->Printf( "Current search path:\n" );
for( int i = 0; i < fileSystemLocal.searchPaths.Num(); i++ ) for( int sp = fileSystemLocal.searchPaths.Num() - 1; sp >= 0; sp-- )
{ {
common->Printf( "%s/%s\n", fileSystemLocal.searchPaths[i].path.c_str(), fileSystemLocal.searchPaths[i].gamedir.c_str() ); common->Printf( "%s/%s\n", fileSystemLocal.searchPaths[sp].path.c_str(), fileSystemLocal.searchPaths[sp].gamedir.c_str() );
}
for( int i = 0; i < fileSystemLocal.resourceFiles.Num(); i++ )
{
common->Printf( "%s\n", fileSystemLocal.resourceFiles[i]->GetFileName() );
} }
} }
@ -2840,6 +2849,14 @@ idFileSystemLocal::AddResourceFile
*/ */
int idFileSystemLocal::AddResourceFile( const char* resourceFileName ) int idFileSystemLocal::AddResourceFile( const char* resourceFileName )
{ {
// RB: check if it was already added
int idx = FindResourceFile( resourceFileName );
if( idx != -1 )
{
return idx;
}
// RB end
idStrStatic< MAX_OSPATH > resourceFile = va( "maps/%s", resourceFileName ); idStrStatic< MAX_OSPATH > resourceFile = va( "maps/%s", resourceFileName );
idResourceContainer* rc = new idResourceContainer(); idResourceContainer* rc = new idResourceContainer();
if( rc->Init( resourceFile, resourceFiles.Num() ) ) if( rc->Init( resourceFile, resourceFiles.Num() ) )
@ -2944,27 +2961,46 @@ void idFileSystemLocal::AddGameDirectory( const char* path, const char* dir )
search.path = path; search.path = path;
search.gamedir = dir; search.gamedir = dir;
idStr pakfile = BuildOSPath( path, dir, "" ); // RB: add all maps/*.resources
pakfile[ pakfile.Length() - 1 ] = 0; // strip the trailing slash idStr pakfile;
for( int i = 0; i < 2; i++ )
idStrList pakfiles;
ListOSFiles( pakfile, ".resources", pakfiles );
pakfiles.SortWithTemplate( idSort_PathStr() );
if( pakfiles.Num() > 0 )
{ {
// resource files present, ignore pak files if( i == 1 )
for( int i = 0; i < pakfiles.Num(); i++ )
{ {
pakfile = pakfiles[i]; //BuildOSPath( path, dir, pakfiles[i] ); pakfile = BuildOSPath( path, dir, "maps" );
idResourceContainer* rc = new idResourceContainer(); }
if( rc->Init( pakfile, resourceFiles.Num() ) ) else
{
pakfile = BuildOSPath( path, dir, "" );
pakfile[ pakfile.Length() - 1 ] = 0; // strip the trailing slash
}
idStrList pakfiles;
ListOSFiles( pakfile, ".resources", pakfiles );
pakfiles.SortWithTemplate( idSort_PathStr() );
if( pakfiles.Num() > 0 )
{
// resource files present, ignore pak files
for( int j = 0; j < pakfiles.Num(); j++ )
{ {
resourceFiles.Append( rc ); pakfile = pakfiles[j]; //BuildOSPath( path, dir, pakfiles[i] );
common->Printf( "Loaded resource file %s\n", pakfile.c_str() );
//com_productionMode.SetInteger( 2 ); if( i == 1 )
{
pakfile.Insert( "maps/", 0 );
}
idResourceContainer* rc = new idResourceContainer();
if( rc->Init( pakfile, resourceFiles.Num() ) )
{
resourceFiles.Append( rc );
common->Printf( "Loaded resource file %s\n", pakfile.c_str() );
//com_productionMode.SetInteger( 2 );
}
} }
} }
} }
// RB end
} }
/* /*