introduce dpk / dpkdir support

- do not rely on game name but on new dpk format
  to check for DEPS and versions
- pk3 / pk3dir support is for legacy paks only
- add pk4dir support for free (legacy paks)

replace unvanquished references by daemon ones
in function/variable name for versionned vfs code

diff --git a/plugins/archivezip/plugin.cpp b/plugins/archivezip/plugin.cpp
index 8375eafa2114eaf5592c2e2a88dd04921472c165..c88886e64233e42b990c67b8813f6b7b7a79edf2 100644 (file)
--- a/plugins/archivezip/plugin.cpp
+++ b/plugins/archivezip/plugin.cpp
@@ -69,9 +69,30 @@ typedef SingletonModule<ArchivePK4API> ArchivePK4Module;
 ArchivePK4Module g_ArchivePK4Module;
 
 
+class ArchiveDPKAPI
+{
+_QERArchiveTable m_archivedpk;
+public:
+typedef _QERArchiveTable Type;
+STRING_CONSTANT( Name, "dpk" );
+
+ArchiveDPKAPI(){
+       m_archivedpk.m_pfnOpenArchive = &OpenArchive;
+}
+_QERArchiveTable* getTable(){
+       return &m_archivedpk;
+}
+};
+
+typedef SingletonModule<ArchiveDPKAPI> ArchiveDPKModule;
+
+ArchiveDPKModule g_ArchiveDPKModule;
+
+
 extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
        initialiseModule( server );
 
        g_ArchiveZipModule.selfRegister();
        g_ArchivePK4Module.selfRegister();
+       g_ArchiveDPKModule.selfRegister();
 }

diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index 7e9ce9e942ad4d0fe46de9f15862a12a71aec7a9..7851210aac1e019b8a96cf0133d81faa17c0367a 100644 (file)
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -126,13 +126,12 @@ static void FixDOSName( char *src ){
        }
 }
 
-
-
 const _QERArchiveTable* GetArchiveTable( ArchiveModules& archiveModules, const char* ext ){
        StringOutputStream tmp( 16 );
        tmp << LowerCase( ext );
        return archiveModules.findModule( tmp.c_str() );
 }
+
 static Archive* InitPakFile( ArchiveModules& archiveModules, const char *filename ){
        const _QERArchiveTable* table = GetArchiveTable( archiveModules, path_get_extension( filename ) );
 
@@ -299,10 +298,10 @@ Archive* AddPk3Dir( const char* fullpath ){
        }
 }
 
-// for unvanquished
+// for Daemon DPK vfs
 
-bool IsUnvanquished(){
-       return strncmp( GlobalRadiant().getGameFile(), "unvanquished", 12 ) == 0;
+Archive* AddDpkDir( const char* fullpath ){
+       return AddPk3Dir( fullpath );
 }
 
 struct pakfile_path_t
@@ -316,7 +315,7 @@ typedef std::map<CopiedString, pakfile_path_t> PakfilePaths;  // key must have n
 
 static PakfilePaths g_pakfile_paths;
 
-void AddUnvPak( const char* name, const char* fullpath, bool is_pakfile ){
+void AddDpkPak( const char* name, const char* fullpath, bool is_pakfile ){
        pakfile_path_t pakfile_path;
        pakfile_path.fullpath = fullpath;
        pakfile_path.is_pakfile = is_pakfile;
@@ -378,7 +377,7 @@ static int VersionCmp(const char* a, const char* b){
 }
 
 // takes name without ext, returns without ext
-static const char* GetLatestVersionOfUnvPak( const char* name ){
+static const char* GetLatestDpkPakVersion( const char* name ){
        const char* maxversion = 0;
        const char* result = 0;
        const char* pakname;
@@ -399,7 +398,7 @@ static const char* GetLatestVersionOfUnvPak( const char* name ){
 }
 
 // release string after using
-static char* GetCurrentMapPakName(){
+static char* GetCurrentMapDpkPakName(){
        char* mapdir;
        char* mapname;
        int mapnamelen;
@@ -411,7 +410,7 @@ static char* GetCurrentMapPakName(){
        mapdir = strrchr( mapname, '/' );
        if ( mapdir ) {
                mapdir -= 12;
-               if ( strncmp( mapdir, ".pk3dir/maps/", 13 ) == 0 ) {
+               if ( strncmp( mapdir, ".dpkdir/maps/", 13 ) == 0 ) {
                        *mapdir = '\0';
                        mapdir = strrchr( mapname, '/' );
                        if ( mapdir ) mapdir++;
@@ -426,14 +425,14 @@ static char* GetCurrentMapPakName(){
 }
 
 // prevent loading duplicates or circular references
-static Archives g_loaded_unv_paks;
+static Archives g_loaded_dpk_paks;
 
 // actual pak adding on initialise, deferred from InitDirectory
-// Unvanquished filesystem doesn't need load all paks it finds
-static void LoadPakWithDeps( const char* pakname ){
+// Daemon DPK filesystem doesn't need load all paks it finds
+static void LoadDpkPakWithDeps( const char* pakname ){
        const char* und = strrchr( pakname, '_' );
-       if ( !und ) pakname = GetLatestVersionOfUnvPak( pakname );
-       if ( !pakname || g_loaded_unv_paks.find( pakname ) != g_loaded_unv_paks.end() ) return;
+       if ( !und ) pakname = GetLatestDpkPakVersion( pakname );
+       if ( !pakname || g_loaded_dpk_paks.find( pakname ) != g_loaded_dpk_paks.end() ) return;
 
        PakfilePaths::iterator i = g_pakfile_paths.find( pakname );
        if ( i == g_pakfile_paths.end() ) return;
@@ -442,9 +441,9 @@ static void LoadPakWithDeps( const char* pakname ){
        if ( i->second.is_pakfile ){
                arc = InitPakFile( FileSystemQ3API_getArchiveModules(), i->second.fullpath.c_str() );
        } else {
-               arc = AddPk3Dir( i->second.fullpath.c_str() );
+               arc = AddDpkDir( i->second.fullpath.c_str() );
        }
-       g_loaded_unv_paks.insert( pakname );
+       g_loaded_dpk_paks.insert( pakname );
 
        ArchiveTextFile* depsFile = arc->openTextFile( "DEPS" );
        if ( !depsFile ) return;
@@ -473,9 +472,9 @@ static void LoadPakWithDeps( const char* pakname ){
                        if ( p_version_end - p_version == 0 ) {
                                const char* p_pakname;
                                CopiedString name_final = CopiedString( StringRange( p_name, p_name_end ) );
-                               p_pakname = GetLatestVersionOfUnvPak( name_final.c_str() );
+                               p_pakname = GetLatestDpkPakVersion( name_final.c_str() );
                                if ( p_pakname != NULL ) {
-                                       LoadPakWithDeps( p_pakname );
+                                       LoadDpkPakWithDeps( p_pakname );
                                }
                        } else {
                                int len = ( p_name_end - p_name ) + ( p_version_end - p_version ) + 1;
@@ -484,7 +483,7 @@ static void LoadPakWithDeps( const char* pakname ){
                                p_pakname[ p_name_end - p_name ] = '\0';
                                strcat( p_pakname, "_" );
                                strncat( p_pakname, p_version, p_version_end - p_version );
-                               LoadPakWithDeps( p_pakname );
+                               LoadDpkPakWithDeps( p_pakname );
                                string_release( p_pakname, len );
                        }
                }
@@ -493,7 +492,7 @@ static void LoadPakWithDeps( const char* pakname ){
        depsFile->release();
 }
 
-// end for unvanquished
+// end for Daemon DPK vfs
 
 // =============================================================================
 // Global functions
@@ -562,13 +561,17 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
                if ( dir != 0 ) {
                        globalOutputStream() << "vfs directory: " << path << "\n";
 
-                       bool unv;
-                       unv = IsUnvanquished();
-
+                       Archives archives;
+                       Archives archivesOverride;
                        const char* ignore_prefix = "";
                        const char* override_prefix = "";
+                       bool is_pk3_vfs, is_pk4_vfs, is_dpk_vfs;
 
-                       if ( !unv ) {
+                       is_pk3_vfs = GetArchiveTable( archiveModules, "pk3" );
+                       is_pk4_vfs = GetArchiveTable( archiveModules, "pk4" );
+                       is_dpk_vfs = GetArchiveTable( archiveModules, "dpk" );
+
+                       if ( !is_dpk_vfs ) {
                                // See if we are in "sp" or "mp" mapping mode
                                const char* gamemode = gamemode_get();
 
@@ -582,8 +585,6 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
                                }
                        }
 
-                       Archives archives;
-                       Archives archivesOverride;
                        for (;; )
                        {
                                const char* name = g_dir_read_name( dir );
@@ -606,21 +607,29 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
                                const char *ext = strrchr( name, '.' );
                                char tmppath[PATH_MAX];
 
-                               if ( ext && !string_compare_nocase_upper( ext, ".pk3dir" ) ) {
-
-                                       snprintf( tmppath, PATH_MAX, "%s%s/", path, name );
-                                       tmppath[PATH_MAX] = '\0';
-                                       FixDOSName( tmppath );
-                                       AddSlash( tmppath );
+                               if ( is_dpk_vfs ) {
+                                       if ( !!ext && !string_compare_nocase_upper( ext, ".dpkdir" ) ) {
+                                               snprintf( tmppath, PATH_MAX, "%s%s/", path, name );
+                                               tmppath[PATH_MAX] = '\0';
+                                               FixDOSName( tmppath );
+                                               AddSlash( tmppath );
+                                               AddDpkPak( CopiedString( StringRange( name, ext ) ).c_str(), tmppath, false );
+                                       }
+                               }
 
-                                       if ( unv ) {
-                                               AddUnvPak( CopiedString( StringRange( name, ext ) ).c_str(), tmppath, false );
-                                       } else {
+                               if ( is_pk3_vfs || is_pk4_vfs ) {
+                                       if ( !!ext && ( !string_compare_nocase_upper( ext, ".pk3dir" )
+                                               || !string_compare_nocase_upper( ext, ".pk4dir" ) ) ) {
+                                               snprintf( tmppath, PATH_MAX, "%s%s/", path, name );
+                                               tmppath[PATH_MAX] = '\0';
+                                               FixDOSName( tmppath );
+                                               AddSlash( tmppath );
                                                AddPk3Dir( tmppath );
                                        }
                                }
 
-                               if ( ( ext == 0 ) || *( ++ext ) == '\0' || GetArchiveTable( archiveModules, ext ) == 0 ) {
+                               // GetArchiveTable() needs "pk3" if ext is ".pk3"
+                               if ( ( ext == 0 ) || *( ext + 1 ) == '\0' || GetArchiveTable( archiveModules, ext + 1 ) == 0 ) {
                                        continue;
                                }
 
@@ -629,9 +638,12 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
                                        continue;
                                }
                                if ( !string_empty( override_prefix ) && strncmp( name, override_prefix, strlen( override_prefix ) ) == 0 ) {
-                                       if ( unv ) {
-                                               archives.insert( name );
-                                       } else {
+                                       if ( !string_compare_nocase_upper( ext, ".dpk" ) ) {
+                                               if ( is_dpk_vfs ) {
+                                                       archives.insert( name );
+                                               }
+                                       }
+                                       else {
                                                archivesOverride.insert( name );
                                        }
                                        continue;
@@ -644,27 +656,40 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
 
                        // add the entries to the vfs
                        char* fullpath;
-                       if ( unv ) {
+                       if ( is_dpk_vfs ) {
                                for ( Archives::iterator i = archives.begin(); i != archives.end(); ++i ) {
                                        const char* name = i->c_str();
                                        const char* ext = strrchr( name, '.' );
-                                       CopiedString name_final = CopiedString( StringRange( name, ext ) );
-                                       fullpath = string_new_concat( path, name );
-                                       AddUnvPak( name_final.c_str(), fullpath, true );
-                                       string_release( fullpath, string_length( fullpath ) );
+                                       if ( !string_compare_nocase_upper( ext, "dpk" ) ) {
+                                               CopiedString name_final = CopiedString( StringRange( name, ext ) );
+                                               fullpath = string_new_concat( path, name );
+                                               AddDpkPak( name_final.c_str(), fullpath, true );
+                                               string_release( fullpath, string_length( fullpath ) );
+                                       }
                                }
-                       } else {
+                       }
+                       if ( is_pk3_vfs || is_pk4_vfs ) {
                                for ( Archives::iterator i = archivesOverride.begin(); i != archivesOverride.end(); ++i )
                                {
-                                       fullpath = string_new_concat( path, i->c_str() );
-                                       InitPakFile( archiveModules, fullpath );
-                                       string_release( fullpath, string_length( fullpath ) );
+                                       const char* name = i->c_str();
+                                       const char* ext = strrchr( name, '.' );
+                                       if ( !string_compare_nocase_upper( ext, "pk3" )
+                                               || !string_compare_nocase_upper( ext, "pk4" ) ) {
+                                               fullpath = string_new_concat( path, i->c_str() );
+                                               InitPakFile( archiveModules, fullpath );
+                                               string_release( fullpath, string_length( fullpath ) );
+                                       }
                                }
                                for ( Archives::iterator i = archives.begin(); i != archives.end(); ++i )
                                {
-                                       fullpath = string_new_concat( path, i->c_str() );
-                                       InitPakFile( archiveModules, fullpath );
-                                       string_release( fullpath, string_length( fullpath ) );
+                                       const char* name = i->c_str();
+                                       const char* ext = strrchr( name, '.' );
+                                       if ( !string_compare_nocase_upper( ext, "pk3" )
+                                               || !string_compare_nocase_upper( ext, "pk4" ) ) {
+                                               fullpath = string_new_concat( path, i->c_str() );
+                                               InitPakFile( archiveModules, fullpath );
+                                               string_release( fullpath, string_length( fullpath ) );
+                                       }
                                }
                        }
                }
@@ -689,7 +714,7 @@ void Shutdown(){
        g_numForbiddenDirs = 0;
 
        g_pakfile_paths.clear();
-       g_loaded_unv_paks.clear();
+       g_loaded_dpk_paks.clear();
 }
 
 #define VFS_SEARCH_PAK 0x1
@@ -823,21 +848,24 @@ void initDirectory( const char *path ){
        InitDirectory( path, FileSystemQ3API_getArchiveModules() );
 }
 void initialise(){
-       if ( IsUnvanquished() ) {
+       ArchiveModules& archiveModules = FileSystemQ3API_getArchiveModules();
+       bool is_dpk_vfs = GetArchiveTable( archiveModules, "dpk" );
+
+       if ( is_dpk_vfs ) {
                const char* pakname;
-               g_loaded_unv_paks.clear();
+               g_loaded_dpk_paks.clear();
 
-               pakname = GetLatestVersionOfUnvPak( "radiant" );
+               pakname = GetLatestDpkPakVersion( "tex-common" );
                if (pakname != NULL) {
-                       LoadPakWithDeps( pakname );
+                       LoadDpkPakWithDeps( pakname );
                }
 
                // prevent VFS double start, for MapName="" and MapName="unnamed.map"
                if ( string_length( GlobalRadiant().getMapName() ) ){
                        // map's tex-* paks have precedence over any other tex-* paks
-                       char* mappakname = GetCurrentMapPakName();
+                       char* mappakname = GetCurrentMapDpkPakName();
                        if ( mappakname != NULL ) {
-                               LoadPakWithDeps( mappakname );
+                               LoadDpkPakWithDeps( mappakname );
                                string_release( mappakname, string_length( mappakname ) );
                        }
 
@@ -848,18 +876,18 @@ void initialise(){
                                const char *c = strchr( paknamever, '_' );
                                char *paknameonly;
                                if ( c ) paknameonly = string_clone_range( StringRange( paknamever, c ) );
-                               pakname = GetLatestVersionOfUnvPak( paknameonly );
+                               pakname = GetLatestDpkPakVersion( paknameonly );
                                if (pakname != NULL) {
-                                       LoadPakWithDeps( pakname );
+                                       LoadDpkPakWithDeps( pakname );
                                }
                                if ( c ) string_release( paknameonly, string_length( paknameonly ) );
                                // then load this specific version
-                               LoadPakWithDeps( paknamever );
+                               LoadDpkPakWithDeps( paknamever );
                        }
                }
 
                g_pakfile_paths.clear();
-               g_loaded_unv_paks.clear();
+               g_loaded_dpk_paks.clear();
        }
 
        globalOutputStream() << "filesystem initialised\n";

diff --git a/radiant/map.cpp b/radiant/map.cpp
index c5cc8a9070bf4b3ac1aa5b7d6e377849e9578efc..0c0fd5f73136a59472c32f7c4b7b9846b3d37979 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -35,6 +35,7 @@ MapModules& ReferenceAPI_getMapModules();
 #include "irender.h"
 #include "ientity.h"
 #include "editable.h"
+#include "iarchive.h"
 #include "ifilesystem.h"
 #include "namespace.h"
 #include "moduleobserver.h"
@@ -409,25 +410,24 @@ void RemoveRegionBrushes( void );
 
 ModuleObservers g_mapPathObservers;
 
-class UnvanquishedMapFileObserver : public ModuleObserver
+class MapFileObserver : public ModuleObserver
 {
 void realise() {
-       if ( strncmp( GlobalRadiant().getGameFile(), "unvanquished", 12 ) == 0 ) {
                // Restart VFS to apply new pak filtering based on mapname
+               // needed for daemon dpk vfs
                VFS_Restart();
-       }
 }
 void unrealise() { }
 };
 
-UnvanquishedMapFileObserver g_unvanquishedMapFileObserver;
+MapFileObserver g_mapFileObserver;
 
 void BindMapFileObservers(){
-       g_mapPathObservers.attach( g_unvanquishedMapFileObserver );
+       g_mapPathObservers.attach( g_mapFileObserver );
 }
 
 void UnBindMapFileObservers(){
-       g_mapPathObservers.detach( g_unvanquishedMapFileObserver );
+       g_mapPathObservers.detach( g_mapFileObserver );
 }
 
 

diff --git a/tools/quake3/common/vfs.c b/tools/quake3/common/vfs.c
index ada7ee713c14d8548e51b273e7e119a95401157d..0f9772b5bac214346ca47793b745a92c1cc20784 100644 (file)
--- a/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@ -218,7 +218,7 @@ void vfsInitDirectory( const char *path ){
                                {
                                        char *ext = strrchr( dirlist, '.' );
 
-                                       if ( ext && !Q_stricmp( ext, ".pk3dir" ) ) {
+                                       if ( ext && ( !Q_stricmp( ext, ".pk3dir" ) || !Q_stricmp( ext, ".dpkdir" ) ) ) {
                                                if ( g_numDirs == VFS_MAXDIRS ) {
                                                        continue;
                                                }
@@ -229,7 +229,7 @@ void vfsInitDirectory( const char *path ){
                                                ++g_numDirs;
                                        }
 
-                                       if ( ( ext == NULL ) || ( Q_stricmp( ext, ".pk3" ) != 0 ) ) {
+                                       if ( ( ext == NULL ) || ( Q_stricmp( ext, ".pk3" ) != 0 || !Q_stricmp( ext, ".dpk" ) != 0 ) ) {
                                                continue;
                                        }
                                }