Merge pull request #558 from Pan7/fixq3data6

Q3data: Fix warning passing unsigned short * to parameter of type sho…
This commit is contained in:
Pan7 2017-08-18 20:05:09 +02:00 committed by GitHub
commit e594c90a60
2 changed files with 2 additions and 2 deletions

View file

@ -47,7 +47,7 @@ static int ReadString( FILE *fp, char *buffer ){
return bytesRead; return bytesRead;
} }
static int ReadChunkAndLength( FILE *fp, short *chunk, long *len ){ static int ReadChunkAndLength( FILE *fp, unsigned short *chunk, long *len ){
if ( fread( chunk, sizeof( short ), 1, fp ) != 1 ) { if ( fread( chunk, sizeof( short ), 1, fp ) != 1 ) {
return 0; return 0;
} }

View file

@ -89,7 +89,7 @@ polyset_t *Polyset_LoadSets( const char *file, int *numpolysets, int maxTrisPerS
} }
else{ else{
Error( "TRI files no longer supported" ); Error( "TRI files no longer supported" );
return; return NULL;
} }
// TRI_LoadPolysets( file, &psets, numpolysets ); // TRI_LoadPolysets( file, &psets, numpolysets );