lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Do not save cleared ban list when reloading bans

Browse source
This commit is contained in:
James R 2020-10-24 15:52:02 -07:00
parent e9fce20071
commit 288ffebea7
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/d_clisrv.c
View file

@ -2918,16 +2918,14 @@ static void Ban_Add(const char *reason)
reasontail = reasonlist; reasontail = reasonlist;
} }
static void Command_ClearBans(void) static void Ban_Clear(void)
{ {
banreason_t *temp; banreason_t *temp;
if (!I_ClearBans)
return;
I_ClearBans(); I_ClearBans();
D_SaveBan();
reasontail = NULL; reasontail = NULL;
while (reasonhead) while (reasonhead)
{ {
temp = reasonhead->next; temp = reasonhead->next;
@ -2937,6 +2935,15 @@ static void Command_ClearBans(void)
} }
} }
static void Command_ClearBans(void)
{
if (!I_ClearBans)
return;
Ban_Clear();
D_SaveBan();
}
static void Ban_Load_File(boolean warning) static void Ban_Load_File(boolean warning)
{ {
FILE *f; FILE *f;
@ -2944,6 +2951,9 @@ static void Ban_Load_File(boolean warning)
const char *address, *mask; const char *address, *mask;
char buffer[MAX_WADPATH]; char buffer[MAX_WADPATH];
if (!I_ClearBans)
return;
f = fopen(va("%s"PATHSEP"%s", srb2home, "ban.txt"), "r"); f = fopen(va("%s"PATHSEP"%s", srb2home, "ban.txt"), "r");
if (!f) if (!f)
@ -2953,13 +2963,7 @@ static void Ban_Load_File(boolean warning)
return; return;
} }
if (I_ClearBans) Ban_Clear();
Command_ClearBans();
else
{
fclose(f);
return;
}
for (i=0; fgets(buffer, (int)sizeof(buffer), f); i++) for (i=0; fgets(buffer, (int)sizeof(buffer), f); i++)
{ {