From 37931fc2531a83a42366fb219eb98bff8c800249 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 1 Nov 2020 19:31:10 -0800 Subject: [PATCH] The lump is not needed for P_WriteThings --- src/m_cheat.c | 2 +- src/p_setup.c | 7 +------ src/p_setup.h | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/m_cheat.c b/src/m_cheat.c index 349f00c48..b28524fd3 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -1435,7 +1435,7 @@ void Command_Writethings_f(void) REQUIRE_SINGLEPLAYER; REQUIRE_OBJECTPLACE; - P_WriteThings(W_GetNumForName(G_BuildMapName(gamemap)) + ML_THINGS); + P_WriteThings(); } void Command_ObjectPlace_f(void) diff --git a/src/p_setup.c b/src/p_setup.c index 7747f6462..578fb6d53 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -904,16 +904,13 @@ static void P_SpawnMapThings(boolean spawnemblems) } // Experimental groovy write function! -void P_WriteThings(lumpnum_t lumpnum) +void P_WriteThings(void) { size_t i, length; mapthing_t *mt; - UINT8 *data; UINT8 *savebuffer, *savebuf_p; INT16 temp; - data = W_CacheLumpNum(lumpnum, PU_LEVEL); - savebuf_p = savebuffer = (UINT8 *)malloc(nummapthings * sizeof (mapthing_t)); if (!savebuf_p) @@ -935,8 +932,6 @@ void P_WriteThings(lumpnum_t lumpnum) WRITEUINT16(savebuf_p, mt->options); } - Z_Free(data); - length = savebuf_p - savebuffer; FIL_WriteFile(va("newthings%d.lmp", gamemap), savebuffer, length); diff --git a/src/p_setup.h b/src/p_setup.h index ef903e103..f8ff11706 100644 --- a/src/p_setup.h +++ b/src/p_setup.h @@ -105,7 +105,7 @@ boolean P_AddWadFile(const char *wadfilename); boolean P_RunSOC(const char *socfilename); void P_LoadSoundsRange(UINT16 wadnum, UINT16 first, UINT16 num); void P_LoadMusicsRange(UINT16 wadnum, UINT16 first, UINT16 num); -void P_WriteThings(lumpnum_t lump); +void P_WriteThings(void); size_t P_PrecacheLevelFlats(void); void P_AllocMapHeader(INT16 i);