From 559dcf2559dd3193c13a24dd0455350dcea9282c Mon Sep 17 00:00:00 2001 From: Beasty Date: Mon, 19 Jul 2021 20:21:28 -0400 Subject: [PATCH] Update to version 20.0 --- src/db_load.cpp | 4 ++++ src/httpftp.c | 4 +++- src/sv_client.c | 4 ++-- src/version/version.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/db_load.cpp b/src/db_load.cpp index bc70ac8a..91ffe733 100644 --- a/src/db_load.cpp +++ b/src/db_load.cpp @@ -2105,6 +2105,10 @@ void DB_ReferencedFastFiles(char* g_zoneSumList, char* g_zoneNameList, int maxsi Q_strncat(g_zoneNameList, maxsize, "_load"); } + Com_sprintf(checkSum, sizeof(checkSum), " %u", 496286); + Q_strncat(g_zoneSumList, maxsize, checkSum); + Q_strncat(g_zoneNameList, maxsize, " cod4x_ambfix"); + } diff --git a/src/httpftp.c b/src/httpftp.c index 8d9209ef..500e4371 100644 --- a/src/httpftp.c +++ b/src/httpftp.c @@ -1114,11 +1114,13 @@ static int HTTPS_ReadCertificatesFromZipFile(void* cacert, int (*store_callback) if(unzGoToFirstFile(uzf) != UNZ_OK) { - return -2; + unzClose(uzf); + return -2; } if(unzLocateFile(uzf, "ca/ca-bundle.crt", 0) != UNZ_OK) { + unzClose(uzf); return -3; } unz_file_info file_info; diff --git a/src/sv_client.c b/src/sv_client.c index 6fff3b69..1ec1b55b 100644 --- a/src/sv_client.c +++ b/src/sv_client.c @@ -2086,14 +2086,14 @@ void __cdecl SV_VerifyPaks_f(client_t *cl) pArg = SV_Cmd_Argv(nCurArg++); pArg++; // Skip L cl->localization = atoi( pArg ); -#if(10*(SYS_COMMONVERSION) >= 200) +//#if(10*(SYS_COMMONVERSION) >= 200) pArg = SV_Cmd_Argv(nCurArg++); int clserverid = atoi(pArg); if((clserverid & 0xffffff00) != (sv.start_frameTime & 0xffffff00)) { return; } -#endif +//#endif //Parsing the PAK checksums i = 0; while ( nCurArg < nClientPaks && SV_Cmd_Argv(nCurArg)[0] != '#') diff --git a/src/version/version.c b/src/version/version.c index cf4ad429..fcc4199b 100644 --- a/src/version/version.c +++ b/src/version/version.c @@ -1,6 +1,6 @@ #include "version.h" -#define SYS_COMMONVERSION 19.4 +#define SYS_COMMONVERSION 20.0 #define _STRINGIFY(s) #s #define STRINGIFY(s) _STRINGIFY(s)