From 4c491d8647cd97d4a679b86ab87948fa0324946f Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sat, 6 Dec 2025 17:19:29 -0500 Subject: [PATCH] Revert "comment out other save game compressors for testing" This reverts commit 479ecdba8d8286ec2491f25b3ec867416fc8efca. --- src/d_clisrv.c | 18 +++++++++--------- src/doomdef.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index f00c97036..b3d6b1c6d 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -68,13 +68,13 @@ #include "discord.h" #endif -/*#ifdef USE_LZ4 +#ifdef USE_LZ4 #include "lz4.h" #elif defined HAVE_ZLIB #include -#else*/ +#else #include "lzf.h" -//#endif +#endif // // NETWORKING @@ -1233,14 +1233,14 @@ static void SV_SendSaveGame(INT32 node, boolean resending) } // Attempt to compress it. -/*#if defined USE_LZ4 +#if defined USE_LZ4 if ((compressedlen = LZ4_compress_fast((char*)(save.buffer + sizeof(UINT32)), (char*)(compressedsave + sizeof(UINT32)), length - sizeof(UINT32), length - sizeof(UINT32) - 1, LZ4_ACCEL))) #elif defined HAVE_ZLIB int compresstatus = compress2(compressedsave + sizeof(UINT32), &compressedlen, save.buffer + sizeof(UINT32), length - sizeof(UINT32), ZLIB_LEVEL); if (compresstatus == Z_OK) -#else*/ +#else if ((compressedlen = lzf_compress(save.buffer + sizeof(UINT32), length - sizeof(UINT32), compressedsave + sizeof(UINT32), length - sizeof(UINT32) - 1))) -//#endif +#endif { CONS_Printf("Compressed savegame of size %zu\n", length - sizeof(UINT32)); CONS_Printf("Compressed savegame is %zu\n", compressedlen); @@ -1341,13 +1341,13 @@ static void CL_LoadReceivedSavegame(boolean reloading) CONS_Printf("Decompressing compressed savegame of size %zu\n", length - sizeof(UINT32)); -/*#if defined USE_LZ4 +#if defined USE_LZ4 LZ4_decompress_safe((char*)save.p, (char*)decompressedbuffer, length - sizeof(UINT32), decompressedlen); #elif defined HAVE_ZLIB uncompress(decompressedbuffer, &decompressedlen, save.p, length - sizeof(UINT32)); -#else*/ +#else lzf_decompress(save.p, length - sizeof(UINT32), decompressedbuffer, decompressedlen); -//#endif +#endif CONS_Printf("Decompressed save is %zu\n", decompressedlen); diff --git a/src/doomdef.h b/src/doomdef.h index 1365a90a3..98462f882 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -213,8 +213,8 @@ extern char logfilename[1024]; //#define ZLIB_LEVEL 5 // LZ4 Options -//#define USE_LZ4 // Use LZ4 for network savegame compression -//#define LZ4_ACCEL 1 +#define USE_LZ4 // Use LZ4 for network savegame compression +#define LZ4_ACCEL 1 // surely nobody's gonna change the palette a second time :Clueless: #define FADECOLOR 0 // 120