remove UMAPDEF (#2093)

fabiangreffrath · Dec 17, 2024 · 3f41e8f · 3f41e8f
1 parent f07688a
commit 3f41e8f
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 457 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -165,7 +165,6 @@ jobs:
             --inconclusive \
             --inline-suppr \
             --std=c99 \
-            --suppress="memleak:${{ github.workspace }}/src/u_scanner.c" \
             --project="${{ github.workspace }}/build/compile_commands.json" \
             -i"${{ github.workspace }}/third-party" \
             -D__GNUC__

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -199,18 +199,18 @@ set(BASE_SOURCES
     all-all/sprites/pls2e0.png
     all-all/sprites/tnt1a0.png
 
-    betalevl.wad/umapdef.lmp
+    betalevl.wad/umapinfo.lmp
 
     chex.wad/brghtmps.lmp
     chex.wad/dehacked.lmp
-    chex.wad/umapdef.lmp
+    chex.wad/umapinfo.lmp
 
     chex2.wad/brghtmps.lmp
 
     doom-all/brghtmps.lmp
 
-    e1m4b.wad/umapdef.lmp
-    e1m8b.wad/umapdef.lmp
+    e1m4b.wad/umapinfo.lmp
+    e1m8b.wad/umapinfo.lmp
 
     extras.wad/sbardef.lmp
 
@@ -219,16 +219,10 @@ set(BASE_SOURCES
 
     id1.wad/sbardef.lmp
 
-    masterlevels.wad/umapdef.lmp
-
-    nerve.wad/umapdef.lmp
-
     rekkr.wad/dehacked.lmp
     rekkrsa.wad/dehacked.lmp
     rekkrsl.wad/dehacked.lmp
 
-    sigil_v1_21.wad/umapdef.lmp
-
     tnt.wad/brghtmps.lmp)
 
 add_custom_command(OUTPUT "${BASE_PK3_PATH}"

diff --git a/base/betalevl.wad/umapdef.lmp → base/betalevl.wad/umapinfo.lmp b/base/betalevl.wad/umapdef.lmp → base/betalevl.wad/umapinfo.lmp
diff --git a/base/chex.wad/umapdef.lmp → base/chex.wad/umapinfo.lmp b/base/chex.wad/umapdef.lmp → base/chex.wad/umapinfo.lmp
diff --git a/base/e1m4b.wad/umapdef.lmp → base/e1m4b.wad/umapinfo.lmp b/base/e1m4b.wad/umapdef.lmp → base/e1m4b.wad/umapinfo.lmp
diff --git a/base/e1m8b.wad/umapdef.lmp → base/e1m8b.wad/umapinfo.lmp b/base/e1m8b.wad/umapdef.lmp → base/e1m8b.wad/umapinfo.lmp
diff --git a/base/masterlevels.wad/umapdef.lmp b/base/masterlevels.wad/umapdef.lmp
diff --git a/base/nerve.wad/umapdef.lmp b/base/nerve.wad/umapdef.lmp
diff --git a/base/sigil_v1_21.wad/umapdef.lmp b/base/sigil_v1_21.wad/umapdef.lmp
diff --git a/src/d_main.c b/src/d_main.c
@@ -2365,8 +2365,6 @@ void D_DoomMain(void)
             I_Error("\nThis is not the registered version.");
     }
 
-  W_ProcessInWads("UMAPDEF", U_ParseMapDefInfo, PROCESS_PWAD);
-
   //!
   // @category mod
   //

diff --git a/src/g_game.c b/src/g_game.c
@@ -3851,23 +3851,16 @@ void G_SetFastParms(int fast_pending)
 
 mapentry_t *G_LookupMapinfo(int episode, int map)
 {
-  char lumpname[9];
-  strcpy(lumpname, MapName(episode, map));
+  char lumpname[9] = {0};
+  M_StringCopy(lumpname, MapName(episode, map), sizeof(lumpname));
 
   mapentry_t *entry;
-
   array_foreach(entry, umapinfo)
   {
     if (!strcasecmp(lumpname, entry->mapname))
       return entry;
   }
 
-  array_foreach(entry, umapdef)
-  {
-    if (!strcasecmp(lumpname, entry->mapname))
-      return entry;
-  }
-
   return NULL;
 }
 

diff --git a/src/m_scanner.h b/src/m_scanner.h
@@ -27,6 +27,9 @@
 // OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 // SUCH DAMAGE.
 
+#ifndef M_SCANNER_H
+#define M_SCANNER_H
+
 #include "doomtype.h"
 
 typedef struct scanner_s scanner_t;
@@ -69,3 +72,5 @@ void SC_Rewind(scanner_t *s); // Only can rewind one step.
 void SC_GetNextTokenLumpName(scanner_t *s);
 
 void SC_Error(scanner_t *s, const char *msg, ...) PRINTF_ATTR(2, 3);
+
+#endif
diff --git a/src/st_widgets.c b/src/st_widgets.c
@@ -646,7 +646,7 @@ void ST_ResetTitle(void)
     announce_string[0] = '\0';
     if (hud_map_announce && leveltime == 0)
     {
-        if (gamemapinfo && U_CheckField(gamemapinfo->author))
+        if (gamemapinfo && gamemapinfo->author)
         {
             M_snprintf(announce_string, sizeof(announce_string), "%s by %s",
                        string, gamemapinfo->author);
-Original file line number
+Diff line change
@@ Expand Up / @@ -2365,8 +2365,6 @@ void D_DoomMain(void) @@
                 I_Error("\nThis is not the registered version.");
         }
-      W_ProcessInWads("UMAPDEF", U_ParseMapDefInfo, PROCESS_PWAD);
       //!
       // @category mod
       //
@@ Expand Down @@