Merge branch 'master' into windows

This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
3089 changed files with 38642 additions and 844823 deletions

View File

@@ -31,7 +31,7 @@ public:
return (int)g_pFullFileSystem->Open( pFileName, "rb", "GAME" );
}
int read( void *pOutput, int size, int file )
int read( void *pOutput, int size, intp file )
{
if ( !file )
return 0;
@@ -39,7 +39,7 @@ public:
return g_pFullFileSystem->Read( pOutput, size, (FileHandle_t)file );
}
void seek( int file, int pos )
void seek( intp file, int pos )
{
if ( !file )
return;
@@ -47,7 +47,7 @@ public:
g_pFullFileSystem->Seek( (FileHandle_t)file, pos, FILESYSTEM_SEEK_HEAD );
}
unsigned int tell( int file )
unsigned int tell( intp file )
{
if ( !file )
return 0;
@@ -55,7 +55,7 @@ public:
return g_pFullFileSystem->Tell( (FileHandle_t)file );
}
unsigned int size( int file )
unsigned int size( intp file )
{
if ( !file )
return 0;
@@ -63,7 +63,7 @@ public:
return g_pFullFileSystem->Size( (FileHandle_t)file );
}
void close( int file )
void close( intp file )
{
if ( !file )
return;