Merge remote-tracking branch 'upstream/lcs' into lcs

This commit is contained in:
Nikolay Korolev
2021-07-13 19:43:48 +03:00
3 changed files with 18 additions and 6 deletions

View File

@ -211,6 +211,10 @@ enum Config {
#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
#ifdef VANILLA_DEFINES
#if !defined(_WIN32) || defined(__LP64__) || defined(_WIN64)
#error Vanilla can only be built for win-x86
#endif
#define FINAL
#define MASTER
//#define USE_MY_DOCUMENTS

View File

@ -828,6 +828,13 @@ FixGarages(uint8 save_type, uint8 *buf, uint8 *buf2, uint32 *size)
SkipBuf(buf2, sizeof(CStoredCar));
}
*size = 0;
assert(buf - buf_start == read);
assert(buf2 - buf2_start == written);
*size = 7876;
}
static void