From 7bb51750842c564c387a493423b569de7eba8afc Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 30 Jul 2024 01:56:45 +0300 Subject: [PATCH] Turn downloaded/ and custom/ into com_strings.h definitions, like sound path and saves path --- engine/client/cl_main.c | 5 ++--- engine/common/com_strings.h | 10 ++++++++-- engine/common/net_chan.c | 2 +- engine/common/net_ws.c | 6 +++--- filesystem/VFileSystem009.cpp | 2 +- filesystem/filesystem.c | 4 ++-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 310203aa..9a0f92dc 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -2594,7 +2594,6 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename ) { int sound_len = sizeof( DEFAULT_SOUNDPATH ) - 1; byte rgucMD5_hash[16]; - const char *pfilename; resource_t *p; if( COM_CheckString( filename ) && successfully_received ) @@ -2602,10 +2601,10 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename ) if( filename[0] != '!' ) Con_Printf( "processing %s\n", filename ); - if( !Q_strnicmp( filename, "downloaded/", 11 )) + if( !Q_strnicmp( filename, DEFAULT_DOWNLOADED_DIRECTORY, sizeof( DEFAULT_DOWNLOADED_DIRECTORY ) - 1 )) { // skip "downloaded/" part to avoid mismatch with needed resources list - filename += 11; + filename += sizeof( DEFAULT_DOWNLOADED_DIRECTORY ) - 1; } } else if( !successfully_received ) diff --git a/engine/common/com_strings.h b/engine/common/com_strings.h index f84b7b57..32e4958f 100644 --- a/engine/common/com_strings.h +++ b/engine/common/com_strings.h @@ -52,12 +52,18 @@ GNU General Public License for more details. #define DEFAULT_EXTERNAL_PALETTE "gfx/palette.pal" -// path to folders where placed all sounds +// path to sound files #define DEFAULT_SOUNDPATH "sound/" -// path store saved games +// path to saved games #define DEFAULT_SAVE_DIRECTORY "save/" +// path to download games +#define DEFAULT_DOWNLOADED_DIRECTORY "downloaded/" + +// path to user mod directory +#define DEFAULT_CUSTOM_DIRECTORY "custom/" + // fallback to this skybox #define DEFAULT_SKYBOX_NAME "desert" diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c index 0217cd7a..a092f8a9 100644 --- a/engine/common/net_chan.c +++ b/engine/common/net_chan.c @@ -1168,7 +1168,7 @@ qboolean Netchan_CopyFileFragments( netchan_t *chan, sizebuf_t *msg ) if( filename[0] != '!' ) { string temp_filename; - Q_snprintf( temp_filename, sizeof( temp_filename ), "downloaded/%s", filename ); + Q_snprintf( temp_filename, sizeof( temp_filename ), DEFAULT_DOWNLOADED_DIRECTORY "%s", filename ); Q_strncpy( filename, temp_filename, sizeof( filename )); } diff --git a/engine/common/net_ws.c b/engine/common/net_ws.c index 5fd10de7..5f6eb75f 100644 --- a/engine/common/net_ws.c +++ b/engine/common/net_ws.c @@ -2282,7 +2282,7 @@ static void HTTP_FreeFile( httpfile_t *file, qboolean error ) file->socket = -1; - Q_snprintf( incname, 256, "downloaded/%s.incomplete", file->path ); + Q_snprintf( incname, sizeof( incname ), DEFAULT_DOWNLOADED_DIRECTORY "%s.incomplete", file->path ); if( error ) { // Switch to next fastdl server if present @@ -2308,7 +2308,7 @@ static void HTTP_FreeFile( httpfile_t *file, qboolean error ) // Success, rename and process file char name[256]; - Q_snprintf( name, 256, "downloaded/%s", file->path ); + Q_snprintf( name, sizeof( name ), DEFAULT_DOWNLOADED_DIRECTORY "%s", file->path ); FS_Rename( incname, name ); if( file->process ) @@ -2527,7 +2527,7 @@ void HTTP_Run( void ) } Con_Reportf( "HTTP: Starting download %s from %s\n", curfile->path, curfile->server->host ); - Q_snprintf( name, sizeof( name ), "downloaded/%s.incomplete", curfile->path ); + Q_snprintf( name, sizeof( name ), DEFAULT_DOWNLOADED_DIRECTORY "%s.incomplete", curfile->path ); curfile->file = FS_Open( name, "wb", true ); diff --git a/filesystem/VFileSystem009.cpp b/filesystem/VFileSystem009.cpp index d75243f3..0c9de1ad 100644 --- a/filesystem/VFileSystem009.cpp +++ b/filesystem/VFileSystem009.cpp @@ -58,7 +58,7 @@ static inline const char *IdToDir( char *dir, size_t size, const char *id ) if( !Q_strcmp( id, "GAMEDOWNLOAD" )) { - Q_snprintf( dir, size, "%s/downloaded", GI->gamefolder ); + Q_snprintf( dir, size, "%s/" DEFAULT_DOWNLOADED_DIRECTORY , GI->gamefolder ); return dir; } diff --git a/filesystem/filesystem.c b/filesystem/filesystem.c index a5b9921f..3ddd2e31 100644 --- a/filesystem/filesystem.c +++ b/filesystem/filesystem.c @@ -1174,14 +1174,14 @@ void FS_AddGameHierarchy( const char *dir, uint flags ) if( isGameDir ) { - Q_snprintf( buf, sizeof( buf ), "%s/downloaded/", dir ); + Q_snprintf( buf, sizeof( buf ), "%s/" DEFAULT_DOWNLOADED_DIRECTORY, dir ); FS_AddGameDirectory( buf, FS_NOWRITE_PATH | FS_CUSTOM_PATH ); } Q_snprintf( buf, sizeof( buf ), "%s/", dir ); FS_AddGameDirectory( buf, flags ); if( isGameDir ) { - Q_snprintf( buf, sizeof( buf ), "%s/custom/", dir ); + Q_snprintf( buf, sizeof( buf ), "%s/" DEFAULT_CUSTOM_DIRECTORY, dir ); FS_AddGameDirectory( buf, FS_NOWRITE_PATH | FS_CUSTOM_PATH ); } }