Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for endless loop bug in Z_Malloc and flood-protect fix for amtele/amtelemark #146

Closed
wants to merge 2 commits into from
Closed

Fix for endless loop bug in Z_Malloc and flood-protect fix for amtele/amtelemark #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d55b7f
Fix endless loop in Z_Malloc due to imageDeleted always being qtrue, …
Feb 15, 2024
079477b
Only allow non-floodprotected amtele/amtelemark if sv_floodProtectNew…
Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codemp/rd-vanilla/tr_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion codemp/server/sv_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down