Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

now uses vfs_load.

Browse Source 
This was SVN commit r970.
This commit is contained in:
janwas 2004-08-11 20:18:49 +00:00
parent 6fa44006e8
commit 436e45daee
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/ps/FileUnpacker.cpp
View File

@ -9,7 +9,7 @@
#include "precompiled.h"
#include "FileUnpacker.h"
#include <stdio.h>
#include "res/vfs.h"
////////////////////////////////////////////////////////////////////////////////////////
// CFileUnpacker constructor
@ -22,6 +22,44 @@ CFileUnpacker::CFileUnpacker() : m_UnpackPos(0), m_Version(0)
// variety of exceptions for missing files etc
void CFileUnpacker::Read(const char* filename,const char magicstr[4])
{
// load the whole thing into memory
void* file;
size_t size;
Handle hm = vfs_load(filename, file, size);
if(hm <= 0)
throw CFileOpenError();
// make sure we read enough for the header
if(size < 12)
{
mem_free_h(hm);
throw CFileReadError();
}
// extract data from header
u8* header = (u8*)file;
char* magic = (char*)(header+0);
m_Version = *(u32*)(header+4);
u32 datasize = *(u32*)(header+8);
void* data = (header+12);
// check we've got the right kind of file
// .. and that we read exactly headersize+datasize
if(strncmp(magic, magicstr, 4) != 0 ||
size != 12+datasize)
{
mem_free_h(hm);
throw CFileTypeError();
}
// allocate memory and read in a big chunk of data
m_Data.resize(datasize);
memcpy(&m_Data[0], data, datasize);
mem_free_h(hm);
/*
FILE* fp=fopen(filename,"rb");
if (!fp) {
throw CFileOpenError();
@ -63,6 +101,7 @@ void CFileUnpacker::Read(const char* filename,const char magicstr[4])
// all done
fclose(fp);
*/
}
////////////////////////////////////////////////////////////////////////////////////////