From d00cc7cddbe5c081371d423cbedb30f8a976be8b Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 25 Mar 2019 16:17:02 -0700 Subject: [PATCH 1/3] Prevent just anyone from skipping credits but allow admins exitlevel works too --- src/d_netcmd.c | 2 +- src/g_game.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 11b9413a8..9d8b5961b 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -4015,7 +4015,7 @@ static void Command_ExitLevel_f(void) CONS_Printf(M_GetText("This only works in a netgame.\n")); else if (!(server || (IsPlayerAdmin(consoleplayer)))) CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n")); - else if (gamestate != GS_LEVEL || demoplayback) + else if (( gamestate != GS_LEVEL && gamestate != GS_CREDITS ) || demoplayback) CONS_Printf(M_GetText("You must be in a level to use this.\n")); else SendNetXCmd(XD_EXITLEVEL, NULL, 0); diff --git a/src/g_game.c b/src/g_game.c index 213c3b83e..748570009 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -15,6 +15,7 @@ #include "console.h" #include "d_main.h" #include "d_player.h" +#include "d_clisrv.h" #include "f_finale.h" #include "p_setup.h" #include "p_saveg.h" @@ -1873,7 +1874,9 @@ boolean G_Responder(event_t *ev) if (F_CreditResponder(ev)) { - F_StartGameEvaluation(); + // Skip credits for everyone + if (!netgame || server || IsPlayerAdmin(consoleplayer)) + SendNetXCmd(XD_EXITLEVEL, NULL, 0); return true; } } @@ -2690,6 +2693,10 @@ void G_ExitLevel(void) // Remove CEcho text on round end. HU_ClearCEcho(); } + else if (gamestate == GS_CREDITS) + { + F_StartGameEvaluation(); + } } // From dcd4995eb3ca9812a0ede191d4b55f48c8c37578 Mon Sep 17 00:00:00 2001 From: Sryder13 Date: Sat, 22 Jun 2019 00:19:34 +0100 Subject: [PATCH 2/3] Remember to end inflating --- src/w_wad.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/w_wad.c b/src/w_wad.c index 5bf7a36d3..4d7d930b6 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1327,8 +1327,9 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si { size = 0; zerr(zErr); - (void)inflateEnd(&strm); } + + (void)inflateEnd(&strm); } else { From 8444379d5357ebed6bb30aca0cb2e804128f399a Mon Sep 17 00:00:00 2001 From: Sryder13 Date: Sat, 22 Jun 2019 00:52:28 +0100 Subject: [PATCH 3/3] Free the zentries --- src/w_wad.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/w_wad.c b/src/w_wad.c index 6ed2d50c2..8d96449f1 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -565,14 +565,14 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) { CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", strerror(ferror(handle))); Z_Free(lumpinfo); - free(zentry); + free(zentries); return NULL; } if (memcmp(zentry->signature, pat_central, 4)) { CONS_Alert(CONS_ERROR, "Central directory is corrupt\n"); Z_Free(lumpinfo); - free(zentry); + free(zentries); return NULL; } @@ -585,7 +585,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) { CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", strerror(ferror(handle))); Z_Free(lumpinfo); - free(zentry); + free(zentries); free(fullname); return NULL; } @@ -627,6 +627,8 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) } } + free(zentries); + *nlmp = numlumps; return lumpinfo; }