vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turn downloaded/ and custom/ into com_strings.h definitions, like sound path and saves path

Browse source
This commit is contained in:
Alibek Omarov 2024-07-30 01:56:45 +03:00
parent dd570b616b
commit 7bb5175084
6 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
engine/client/cl_main.c
View file

@ -2594,7 +2594,6 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename )
{ {
int sound_len = sizeof( DEFAULT_SOUNDPATH ) - 1; int sound_len = sizeof( DEFAULT_SOUNDPATH ) - 1;
byte rgucMD5_hash[16]; byte rgucMD5_hash[16];
const char *pfilename;
resource_t *p; resource_t *p;
if( COM_CheckString( filename ) && successfully_received ) if( COM_CheckString( filename ) && successfully_received )
@ -2602,10 +2601,10 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename )
if( filename[0] != '!' ) if( filename[0] != '!' )
Con_Printf( "processing %s\n", filename ); 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 // skip "downloaded/" part to avoid mismatch with needed resources list
filename += 11; filename += sizeof( DEFAULT_DOWNLOADED_DIRECTORY ) - 1;
} }
} }
else if( !successfully_received ) else if( !successfully_received )

10
engine/common/com_strings.h
View file

@ -52,12 +52,18 @@ GNU General Public License for more details.
#define DEFAULT_EXTERNAL_PALETTE "gfx/palette.pal" #define DEFAULT_EXTERNAL_PALETTE "gfx/palette.pal"
// path to folders where placed all sounds // path to sound files
#define DEFAULT_SOUNDPATH "sound/" #define DEFAULT_SOUNDPATH "sound/"
// path store saved games // path to saved games
#define DEFAULT_SAVE_DIRECTORY "save/" #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 // fallback to this skybox
#define DEFAULT_SKYBOX_NAME "desert" #define DEFAULT_SKYBOX_NAME "desert"

2
engine/common/net_chan.c
View file

@ -1168,7 +1168,7 @@ qboolean Netchan_CopyFileFragments( netchan_t *chan, sizebuf_t *msg )
if( filename[0] != '!' ) if( filename[0] != '!' )
{ {
string temp_filename; 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 )); Q_strncpy( filename, temp_filename, sizeof( filename ));
} }

6
engine/common/net_ws.c
View file

@ -2282,7 +2282,7 @@ static void HTTP_FreeFile( httpfile_t *file, qboolean error )
file->socket = -1; 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 ) if( error )
{ {
// Switch to next fastdl server if present // 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 // Success, rename and process file
char name[256]; 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 ); FS_Rename( incname, name );
if( file->process ) 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 ); 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 ); curfile->file = FS_Open( name, "wb", true );

2
filesystem/VFileSystem009.cpp
View file

@ -58,7 +58,7 @@ static inline const char *IdToDir( char *dir, size_t size, const char *id )
if( !Q_strcmp( id, "GAMEDOWNLOAD" )) 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; return dir;
} }

4
filesystem/filesystem.c
View file

@ -1174,14 +1174,14 @@ void FS_AddGameHierarchy( const char *dir, uint flags )
if( isGameDir ) 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 ); FS_AddGameDirectory( buf, FS_NOWRITE_PATH | FS_CUSTOM_PATH );
} }
Q_snprintf( buf, sizeof( buf ), "%s/", dir ); Q_snprintf( buf, sizeof( buf ), "%s/", dir );
FS_AddGameDirectory( buf, flags ); FS_AddGameDirectory( buf, flags );
if( isGameDir ) 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 ); FS_AddGameDirectory( buf, FS_NOWRITE_PATH | FS_CUSTOM_PATH );
} }
} }