From 2b6ddd69acd00473cd0810d87759943b57a61fba Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Fri, 9 Dec 2022 12:35:44 +0100
Subject: [PATCH] use MAPNAME() more consistently (#836)

---
 src/g_game.c  | 25 +++++--------------------
 src/p_setup.c |  5 +----
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 4b3f46a5..fd265f07 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1207,15 +1207,7 @@ static void G_WriteLevelStat(void)
         }
     }
 
-    if (gamemode == commercial)
-    {
-        M_snprintf(levelString, sizeof(levelString), "MAP%02d", gamemap);
-    }
-    else
-    {
-        M_snprintf(levelString, sizeof(levelString), "E%dM%d",
-                    gameepisode, gamemap);
-    }
+    strcpy(levelString, MAPNAME(gameepisode, gamemap));
 
     G_FormatLevelStatTime(levelTimeString, leveltime);
     G_FormatLevelStatTime(totalTimeString, totalleveltimes + leveltime);
@@ -1854,10 +1846,7 @@ static uint64_t G_Signature(int sig_epi, int sig_map)
   int lump, i;
   char name[9];
   
-  if (gamemode == commercial)
-    sprintf(name, "map%02d", sig_map);
-  else
-    sprintf(name, "E%dM%d", sig_epi, sig_map);
+  strcpy(name, MAPNAME(sig_epi, sig_map));
 
   lump = W_CheckNumForName(name);
 
@@ -3144,10 +3133,7 @@ mapentry_t *G_LookupMapinfo(int episode, int map)
   int i;
   char lumpname[9];
 
-  if (gamemode == commercial)
-    M_snprintf(lumpname, 9, "MAP%02d", map);
-  else
-    M_snprintf(lumpname, 9, "E%dM%d", episode, map);
+  strcpy(lumpname, MAPNAME(episode, map));
 
   for (i = 0; i < U_mapinfo.mapcount; i++)
   {
@@ -3181,14 +3167,13 @@ int G_ValidateMapName(const char *mapname, int *pEpi, int *pMap)
   {
     if (sscanf(mapuname, "E%dM%d", &epi, &map) != 2)
       return 0;
-    M_snprintf(lumpname, 9, "E%dM%d", epi, map);
+    strcpy(lumpname, MAPNAME(epi, map));
   }
   else
   {
     if (sscanf(mapuname, "MAP%d", &map) != 1)
       return 0;
-    M_snprintf(lumpname, 9, "MAP%02d", map);
-    epi = 1;
+    strcpy(lumpname, MAPNAME(epi = 1, map));
   }
 
   if (epi > 4)
diff --git a/src/p_setup.c b/src/p_setup.c
index 74b75ddb..2079ab7d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1549,10 +1549,7 @@ void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
   //    W_Reload ();     killough 1/31/98: W_Reload obsolete
 
   // find map name
-  if (gamemode == commercial)
-    sprintf(lumpname, "MAP%02d", map);           // killough 1/24/98: simplify
-  else
-    sprintf(lumpname, "E%dM%d", episode, map);   // killough 1/24/98: simplify
+  strcpy(lumpname, MAPNAME(episode, map));
 
   lumpnum = W_GetNumForName(lumpname);