Equalising the 32 and 64 bit state compression

because that allow loading both
This commit is contained in:
John Peterson 2013-06-06 09:00:52 +02:00
parent 5bd44d7e3f
commit 825c5ca09a
1 changed files with 4 additions and 4 deletions

View File

@ -59,7 +59,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 19; static const u32 STATE_VERSION = 20;
enum enum
{ {
@ -257,7 +257,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
lzo_uint i = 0; lzo_uint i = 0;
while (true) while (true)
{ {
lzo_uint cur_len = 0; lzo_uint32 cur_len = 0;
lzo_uint out_len = 0; lzo_uint out_len = 0;
if ((i + IN_LEN) >= buffer_size) if ((i + IN_LEN) >= buffer_size)
@ -269,7 +269,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
PanicAlertT("Internal LZO Error - compression failed"); PanicAlertT("Internal LZO Error - compression failed");
// The size of the data to write is 'out_len' // The size of the data to write is 'out_len'
f.WriteArray(&out_len, 1); f.WriteArray((lzo_uint32*)&out_len, 1);
f.WriteBytes(out, out_len); f.WriteBytes(out, out_len);
if (cur_len != IN_LEN) if (cur_len != IN_LEN)
@ -379,7 +379,7 @@ void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data)
lzo_uint i = 0; lzo_uint i = 0;
while (true) while (true)
{ {
lzo_uint cur_len = 0; // number of bytes to read lzo_uint32 cur_len = 0; // number of bytes to read
lzo_uint new_len = 0; // number of bytes to write lzo_uint new_len = 0; // number of bytes to write
if (!f.ReadArray(&cur_len, 1)) if (!f.ReadArray(&cur_len, 1))