From f67684b31a68606d89318216657d58e4382849d4 Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 5 Aug 2023 14:41:52 +0300 Subject: [PATCH 1/3] Fix ban.txt crash --- src/d_clisrv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index adceff581..775034fa8 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2909,6 +2909,12 @@ void D_LoadBan(boolean warning) address = strtok(buffer, " /\t\r\n"); mask = strtok(NULL, " \t\r\n"); + if (!address) + { + malformed = true; + continue; + } + if (i == 0 && !strncmp(address, "BANFORMAT", 9)) { if (mask) -- 2.54.0 From 63f0d15fbf081efb275213e186b4674f4b5ac90b Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sat, 5 Aug 2023 13:52:41 +0200 Subject: [PATCH 2/3] Lets make it v7 so much shit was added since initial v6 so lets just go straight to v7 c: --- src/doomdef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index 43048ae00..09d00aba8 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -149,8 +149,8 @@ extern char logfilename[1024]; #else #define VERSION 1 // Game version #define SUBVERSION 6 // more precise version number -#define VERSIONSTRING "Saturn v6.0 " -#define VERSIONSTRINGW L"Saturn v6.0" +#define VERSIONSTRING "Saturn v7.0 " +#define VERSIONSTRINGW L"Saturn v7.0" // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // And change CMakeLists.txt (not src/, but in root), for CMake users! // AND appveyor.yml, for the build bots! -- 2.54.0 From 2915772231b2e025ffcbec1fa391665f3e81b6a4 Mon Sep 17 00:00:00 2001 From: Indev Date: Tue, 8 Aug 2023 12:41:32 +0300 Subject: [PATCH 3/3] Change chat fadeout time minimum value to 1 second --- src/g_game.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_game.c b/src/g_game.c index de0a5d08c..69fd74cf0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -431,7 +431,7 @@ static CV_PossibleValue_t deadzone_cons_t[] = {{FRACUNIT/16, "MIN"}, {FRACUNIT, //consvar_t cv_compactscoreboard= {"compactscoreboard", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // chat timer thingy -static CV_PossibleValue_t chattime_cons_t[] = {{5, "MIN"}, {999, "MAX"}, {0, NULL}}; +static CV_PossibleValue_t chattime_cons_t[] = {{1, "MIN"}, {999, "MAX"}, {0, NULL}}; consvar_t cv_chattime = {"chattime", "8", CV_SAVE, chattime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // chatwidth -- 2.54.0