From f2b21c6055bf9129ea76bc58fd85d8a430fa9d43 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 28 Jul 2024 18:54:18 +0200 Subject: [PATCH] Revert "fix some G_BuildMapTitle memleaks" This reverts commit e5159e13ddb3da0545b3daf22963c7e88efe7eb8. --- src/d_netcmd.c | 5 +---- src/g_game.c | 18 +++--------------- src/hu_stuff.c | 8 ++------ 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index a3254437b..c5156929d 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -3158,10 +3158,7 @@ static void Command_ReplayMarker(void) demo.savemode = DSM_WILLAUTOSAVE; if (adjustedleveltime < 0) adjustedleveltime = 0; - char *title = G_BuildMapTitle(gamemap); - snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername); - Z_Free(title); - + snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", G_BuildMapTitle(gamemap), G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername); CONS_Printf("Replay will be saved!\n"); } } diff --git a/src/g_game.c b/src/g_game.c index ea824ab48..9032a0377 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -4621,14 +4621,8 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep, for (i = 0, mapnum = 1; i < NUMMAPS; ++i, ++mapnum) if (mapheaderinfo[i]) { - char *title = G_BuildMapTitle(mapnum); - if (!( realmapname = title )) - { - Z_Free(title); + if (!( realmapname = G_BuildMapTitle(mapnum) )) continue; - } - - Z_Free(title); aprop = realmapname; @@ -4700,9 +4694,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep, } if (newmapnum) { - char *title = G_BuildMapTitle(newmapnum); - newmapname = title; - Z_Free(title); + newmapname = G_BuildMapTitle(newmapnum); } } @@ -4792,11 +4784,7 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep) return 0; if (realmapnamep) - { - char *title = G_BuildMapTitle(newmapnum); - (*realmapnamep) = title; - Z_Free(title); - } + (*realmapnamep) = G_BuildMapTitle(newmapnum); } return newmapnum; diff --git a/src/hu_stuff.c b/src/hu_stuff.c index eebf7eff7..27a44f6d7 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2735,16 +2735,12 @@ static void HU_DrawRankings(void) //V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, "Record Attack"); //else //V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, gametype_cons_t[gametype].strvalue); - - char *maptitle = G_BuildMapTitle(gamemap); // draw the current map in the lower right if theres none just say its unknown - if (!maptitle) + if (!G_BuildMapTitle(gamemap)) V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, "UNKNOWN"); else - V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, maptitle); - - Z_Free(maptitle); + V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, G_BuildMapTitle(gamemap)); if (G_GametypeHasTeams()) {