X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=dpvsimpledecode.c;h=bd0047050e683e98c09840dae609ca89ebc69a90;hp=0d30b4f703e1a3dec7e85a82191886a9f4ff30a4;hb=29de7088f191d21a0c7dd5396cb5cead032c2ac2;hpb=b37129d36872d2d42d861024433c34239b24f6a3 diff --git a/dpvsimpledecode.c b/dpvsimpledecode.c index 0d30b4f7..bd004705 100644 --- a/dpvsimpledecode.c +++ b/dpvsimpledecode.c @@ -20,7 +20,7 @@ typedef struct { - FILE *file; + qfile_t *file; int endoffile; } hz_bitstream_read_t; @@ -45,9 +45,9 @@ hz_bitstream_readblocks_t; hz_bitstream_read_t *hz_bitstream_read_open(char *filename) { - FILE *file; + qfile_t *file; hz_bitstream_read_t *stream; - if ((file = fopen(filename, "rb"))) + if ((file = FS_Open (filename, "rb", false))) { stream = malloc(sizeof(hz_bitstream_read_t)); memset(stream, 0, sizeof(*stream)); @@ -62,22 +62,11 @@ void hz_bitstream_read_close(hz_bitstream_read_t *stream) { if (stream) { - fclose(stream->file); + FS_Close(stream->file); free(stream); } } -unsigned int hz_bitstream_read_currentbyte(hz_bitstream_read_t *stream) -{ - return ftell(stream->file); -} - -int hz_bitstream_read_seek(hz_bitstream_read_t *stream, unsigned int position) -{ - stream->endoffile = 0; - return fseek(stream->file, position, SEEK_SET) != 0; -} - hz_bitstream_readblocks_t *hz_bitstream_read_blocks_new(void) { hz_bitstream_readblocks_t *blocks; @@ -133,7 +122,7 @@ int hz_bitstream_read_blocks_read(hz_bitstream_readblocks_t *blocks, hz_bitstrea else b->size = s; s -= b->size; - if (fread(b->data, 1, b->size, stream->file) != b->size) + if (FS_Read(stream->file, b->data, b->size) != b->size) { stream->endoffile = 1; break;