miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.7.1

Browse Source 
--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2017-06-14 01:41:15 +03:00
parent a41510fd20
commit 20c8381879
61 changed files with 599 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/saveload.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: saveload.cpp 27778 2017-03-11 20:37:32Z frosch $ */
/* $Id: saveload.cpp 27862 2017-05-03 20:05:52Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -1994,7 +1994,7 @@ struct LZOLoadFilter : LoadFilter {
byte out[LZO_BUFFER_SIZE + LZO_BUFFER_SIZE / 16 + 64 + 3 + sizeof(uint32) * 2];
uint32 tmp[2];
uint32 size;
lzo_uint len;
lzo_uint len = ssize;
/* Read header*/
if (this->chain->Read((byte*)tmp, sizeof(tmp)) != sizeof(tmp)) SlError(STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE, "File read failed");
@@ -2016,7 +2016,8 @@ struct LZOLoadFilter : LoadFilter {
if (tmp[0] != lzo_adler32(0, out, size + sizeof(uint32))) SlErrorCorrupt("Bad checksum");
/* Decompress */
lzo1x_decompress_safe(out + sizeof(uint32) * 1, size, buf, &len, NULL);
int ret = lzo1x_decompress_safe(out + sizeof(uint32) * 1, size, buf, &len, NULL);
if (ret != LZO_E_OK) SlError(STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE);
return len;
}
};