umapinfo: finale handling improvements, cosmetic changes (#2096)

* rename u_mapinfo->g_umapinfo, cosmetic changes * update copyright and README.md
fabiangreffrath · Dec 20, 2024 · 5b1851e · 5b1851e
1 parent 8a8d4f8
commit 5b1851e
Show file tree

Hide file tree

Showing 17 changed files with 575 additions and 382 deletions.
diff --git a/README.md b/README.md
@@ -155,7 +155,6 @@ Copyright:
  © 2007-2011 Moritz "Ripper" Kroll;  
  © 2008-2019 Simon Judd;  
  © 2017 Christoph Oelckers;  
- © 2019 Fernando Carmona Varo;  
  © 2020 Alex Mayfield;  
  © 2020-2024 Fabian Greffrath;  
  © 2020-2024 Roman Fomin;  

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -27,6 +27,7 @@ set(WOOF_SOURCES
     g_game.c               g_game.h
     g_input.c              g_input.h
     g_nextweapon.c         g_nextweapon.h
+    g_umapinfo.c           g_umapinfo.h
     hu_command.c           hu_command.h
     hu_coordinates.c       hu_coordinates.h
     hu_crosshair.c         hu_crosshair.h
@@ -137,7 +138,6 @@ set(WOOF_SOURCES
     st_widgets.c           st_widgets.h
     statdump.c             statdump.h
     tables.c               tables.h
-    u_mapinfo.c            u_mapinfo.h
     v_flextran.c           v_flextran.h
     v_fmt.c                v_fmt.h
     v_trans.c              v_trans.h

diff --git a/src/d_main.c b/src/d_main.c
@@ -80,7 +80,7 @@
 #include "st_stuff.h"
 #include "st_widgets.h"
 #include "statdump.h"
-#include "u_mapinfo.h"
+#include "g_umapinfo.h"
 #include "v_fmt.h"
 #include "v_video.h"
 #include "w_wad.h"
@@ -2379,7 +2379,7 @@ void D_DoomMain(void)
 
   if (!M_ParmExists("-nomapinfo"))
   {
-    W_ProcessInWads("UMAPINFO", U_ParseMapInfo, PROCESS_IWAD | PROCESS_PWAD);
+    W_ProcessInWads("UMAPINFO", G_ParseMapInfo, PROCESS_IWAD | PROCESS_PWAD);
   }
 
   G_ParseCompDatabase();