From 9d55b7f622bc012109e8c920c7e8148e4d8ac54b Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 15 Feb 2024 16:08:35 +0100 Subject: [PATCH 1/2] Fix endless loop in Z_Malloc due to imageDeleted always being qtrue, even if no images were deleted. --- codemp/rd-vanilla/tr_image.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemp/rd-vanilla/tr_image.cpp b/codemp/rd-vanilla/tr_image.cpp index b874061472..2e4694a24a 100644 --- a/codemp/rd-vanilla/tr_image.cpp +++ b/codemp/rd-vanilla/tr_image.cpp @@ -874,7 +874,7 @@ qboolean RE_RegisterImages_LevelLoadEnd(void) // int iNumImages = AllocatedImages.size(); // more for curiosity, really. - qboolean imageDeleted = qtrue; + qboolean imageDeleted = qfalse; for (AllocatedImages_t::iterator itImage = AllocatedImages.begin(); itImage != AllocatedImages.end(); /* blank */) { qboolean bEraseOccured = qfalse; From 079477b571ebd79d5f48ba6258d4d21c3e4a4ba2 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 15 Feb 2024 16:11:43 +0100 Subject: [PATCH 2/2] Only allow non-floodprotected amtele/amtelemark if sv_floodProtectNew is 3 or higher. --- codemp/server/sv_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemp/server/sv_client.cpp b/codemp/server/sv_client.cpp index 5efbda7ae4..5bd271a4ea 100644 --- a/codemp/server/sv_client.cpp +++ b/codemp/server/sv_client.cpp @@ -1578,7 +1578,7 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t *msg ) { else cl->lastReliableTime[3] = svs.time; } - else if (!Q_stricmpn(s, "amTele", 6) || !Q_stricmpn(s, "amTeleMark", 10)) { + else if (sv_newfloodProtect->integer > 2 && (!Q_stricmpn(s, "amTele", 6) || !Q_stricmpn(s, "amTeleMark", 10))) { // If sv_newFloodProtect is 3 or higher, don't flood protect amtele/amtelemark clientOk = qtrue; } else {