ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

saves.cpp missing some include guards for HAVE_LIBZ, this at least gets it to compile without libz

This commit is contained in:
gecko_reverse 2008-09-21 00:28:53 +00:00
parent a69f11b455
commit 6bdad735c0
1 changed files with 246 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desmume/src/saves.cpp
View File

@ -470,13 +470,21 @@ bool savestate_save(std::ostream* outstream, int compressionLevel)
outstream->write((char*)cbuf,comprlen==-1?len:comprlen); outstream->write((char*)cbuf,comprlen==-1?len:comprlen);
if(cbuf != (uint8*)ms.buf()) delete[] cbuf; if(cbuf != (uint8*)ms.buf()) delete[] cbuf;
#ifdef HAVE_LIBZ
return error == Z_OK; return error == Z_OK;
#else
return true;
#endif
} }
bool savestate_save (const char *file_name) bool savestate_save (const char *file_name)
{ {
memorystream ms; memorystream ms;
#ifdef HAVE_LIBZ
if(!savestate_save(&ms, Z_DEFAULT_COMPRESSION)) if(!savestate_save(&ms, Z_DEFAULT_COMPRESSION))
#else
if(!savestate_save(&ms, 0))
#endif
return false; return false;
ms.flush(); ms.flush();
FILE* file = fopen(file_name,"wb"); FILE* file = fopen(file_name,"wb");
@ -569,10 +577,12 @@ bool savestate_load(std::istream* is)
is->read(&cbuf[0],comprlen); is->read(&cbuf[0],comprlen);
if(is->fail()) return false; if(is->fail()) return false;
#ifdef HAVE_LIBZ
uLongf uncomprlen = len; uLongf uncomprlen = len;
int error = uncompress((uint8*)&buf[0],&uncomprlen,(uint8*)&cbuf[0],comprlen); int error = uncompress((uint8*)&buf[0],&uncomprlen,(uint8*)&cbuf[0],comprlen);
if(error != Z_OK || uncomprlen != len) if(error != Z_OK || uncomprlen != len)
return false; return false;
#endif
} else { } else {
is->read((char*)&buf[0],len); is->read((char*)&buf[0],len);
} }