quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify phrasing in vsf.c

Browse Source
This commit is contained in:
Garux 2020-01-20 17:49:44 +03:00
parent bc8cc6e213
commit 67820df935
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/quake3/common/vfs.c
View File

@ -114,14 +114,13 @@ static void vfsInitPakFile( const char *filename ){
{ {
char filename_inzip[NAME_MAX]; char filename_inzip[NAME_MAX];
unz_file_info file_info; unz_file_info file_info;
VFS_PAKFILE* file;
err = unzGetCurrentFileInfo( uf, &file_info, filename_inzip, sizeof( filename_inzip ), NULL, 0, NULL, 0 ); err = unzGetCurrentFileInfo( uf, &file_info, filename_inzip, sizeof( filename_inzip ), NULL, 0, NULL, 0 );
if ( err != UNZ_OK ) { if ( err != UNZ_OK ) {
break; break;
} }
file = (VFS_PAKFILE*)safe_malloc( sizeof( VFS_PAKFILE ) ); VFS_PAKFILE* file = safe_malloc( sizeof( VFS_PAKFILE ) );
g_pakFiles = g_slist_append( g_pakFiles, file ); g_pakFiles = g_slist_append( g_pakFiles, file );
FixDOSName( filename_inzip ); FixDOSName( filename_inzip );
@ -242,10 +241,9 @@ void vfsListShaderFiles( StrList* list, void pushStringCallback( StrList* list,
//char filename[PATH_MAX]; //char filename[PATH_MAX];
char *dirlist; char *dirlist;
GDir *dir; GDir *dir;
int i, k;
char path[NAME_MAX]; char path[NAME_MAX];
/* search in dirs */ /* search in dirs */
for ( i = 0; i < g_numDirs; i++ ){ for ( int i = 0; i < g_numDirs; i++ ){
snprintf( path, NAME_MAX, "%sscripts/", g_strDirs[ i ] ); snprintf( path, NAME_MAX, "%sscripts/", g_strDirs[ i ] );
dir = g_dir_open( path, 0, NULL ); dir = g_dir_open( path, 0, NULL );
@ -530,7 +528,7 @@ qboolean vfsPackFile( const char *filename, const char *packname, const int comp
bufferptr = safe_malloc( file->size + 1 ); bufferptr = safe_malloc( file->size + 1 );
// we need to end the buffer with a 0 // we need to end the buffer with a 0
( (char*) ( bufferptr ) )[file->size] = 0; bufferptr[file->size] = 0;
i = unzReadCurrentFile( file->zipfile, bufferptr, file->size ); i = unzReadCurrentFile( file->zipfile, bufferptr, file->size );
unzCloseCurrentFile( file->zipfile ); unzCloseCurrentFile( file->zipfile );