Merge branch 'woof' into upstream-merge

MrAlaux · Jan 9, 2025 · 45cc43b · 45cc43b
2 parents 18663af + afd3ac8
commit 45cc43b
Show file tree

Hide file tree

Showing 77 changed files with 3,681 additions and 4,174 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/CMakeLists.txt b/CMakeLists.txt
@@ -55,6 +55,7 @@ check_library_exists(m pow "" HAVE_LIBM)
 check_include_file("dirent.h" HAVE_DIRENT_H)
 check_symbol_exists(strcasecmp "strings.h" HAVE_DECL_STRCASECMP)
 check_symbol_exists(strncasecmp "strings.h" HAVE_DECL_STRNCASECMP)
+check_symbol_exists(getpwuid "unistd.h;sys/types.h;pwd.h" HAVE_GETPWUID)
 check_c_source_compiles("
     #include <windows.h>
     int main()

diff --git a/README.md b/README.md
@@ -327,7 +327,6 @@ Copyright:
  © 2007-2011 Moritz "Ripper" Kroll;  
  © 2008-2019 Simon Judd;  
  © 2017 Christoph Oelckers;  
- © 2019 Fernando Carmona Varo;  
  © 2020 Alex Mayfield;  
  © 2020 JadingTsunami;  
  © 2020-2024 Fabian Greffrath;  
@@ -353,10 +352,9 @@ Copyright:
  © 2023 Andrew Apted.  
 License: [MIT](https://opensource.org/licenses/MIT)
 
-Files: `src/u_scanner.*`  
+Files: `src/m_scanner.*`  
 Copyright:  
- © 2010 Braden "Blzut3" Obrzut;  
- © 2019 Fernando Carmona Varo.  
+ © 2015 Braden "Blzut3" Obrzut.  
 License: [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
 Files: `src/v_flextran.*`  

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -215,18 +215,18 @@ set(BASE_SOURCES
     all-all/sprites/ngtrf0.png
     all-all/sprites/ngtrg0.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
 
@@ -235,16 +235,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/all-all/compdb.lmp b/base/all-all/compdb.lmp
@@ -19,6 +19,11 @@
           }
         ]
       },
+      {
+        "name": "doomsday_of_uac_e1m8",
+        "md5": "32fc3115a3162b623f0d0f4e7dee6861",
+        "complevel": "1.9"
+      },
       {
         "name": "hell_revealed_map19",
         "md5": "811a0c97777a198bc9b2bb558cb46e6a",
@@ -34,7 +39,6 @@
         "md5": "145c4dfcf843f2b92c73036ba0e1d98a",
         "options": [ {"name": "comp_vile", "value": 1} ]
       },
-
       {
         "name": "hell_to_pay_map14",
         "md5": "5379c080299eb961792b50ad96821543",

diff --git a/base/all-all/sbardef.lmp b/base/all-all/sbardef.lmp
@@ -981,7 +981,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 16,
               "alignment": 34,
               "tranmap": null,
@@ -996,7 +996,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 8,
               "alignment": 34,
               "tranmap": null,
@@ -1010,7 +1010,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 0,
               "alignment": 34,
               "tranmap": null,
@@ -1024,7 +1024,7 @@
           {
             "widget":
             {
-              "x": 0,
+              "x": 2,
               "y": 8,
               "alignment": 0,
               "tranmap": null,
@@ -1038,7 +1038,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 167,
               "alignment": 42,
               "tranmap": null,
@@ -1851,7 +1851,7 @@
                 {
                   "widget":
                   {
-                    "x": 320,
+                    "x": 318,
                     "y": 16,
                     "alignment": 34,
                     "tranmap": null,
@@ -1866,7 +1866,7 @@
                 {
                   "widget":
                   {
-                    "x": 320,
+                    "x": 318,
                     "y": 8,
                     "alignment": 34,
                     "tranmap": null,
@@ -1880,7 +1880,7 @@
                 {
                   "widget":
                   {
-                    "x": 320,
+                    "x": 318,
                     "y": 0,
                     "alignment": 34,
                     "tranmap": null,
@@ -1894,7 +1894,7 @@
                 {
                   "widget":
                   {
-                    "x": 0,
+                    "x": 2,
                     "y": 8,
                     "alignment": 0,
                     "tranmap": null,
@@ -1908,7 +1908,7 @@
                 {
                   "widget":
                   {
-                    "x": 320,
+                    "x": 318,
                     "y": 167,
                     "alignment": 42,
                     "tranmap": null,
@@ -2923,7 +2923,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 16,
               "alignment": 34,
               "tranmap": null,
@@ -2938,7 +2938,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 8,
               "alignment": 34,
               "tranmap": null,
@@ -2952,7 +2952,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 0,
               "alignment": 34,
               "tranmap": null,
@@ -2966,7 +2966,7 @@
           {
             "widget":
             {
-              "x": 0,
+              "x": 2,
               "y": 8,
               "alignment": 0,
               "tranmap": null,
@@ -2980,7 +2980,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 167,
               "alignment": 42,
               "tranmap": null,
@@ -3242,7 +3242,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 16,
               "alignment": 34,
               "tranmap": null,
@@ -3257,7 +3257,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 8,
               "alignment": 34,
               "tranmap": null,
@@ -3271,7 +3271,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 0,
               "alignment": 34,
               "tranmap": null,
@@ -3285,7 +3285,7 @@
           {
             "widget":
             {
-              "x": 0,
+              "x": 2,
               "y": 8,
               "alignment": 0,
               "tranmap": null,
@@ -3299,7 +3299,7 @@
           {
             "widget":
             {
-              "x": 320,
+              "x": 318,
               "y": 200,
               "alignment": 42,
               "tranmap": null,
@@ -3327,7 +3327,7 @@
           {
             "widget":
             {
-              "x": 2,
+              "x": 0,
               "y": 0,
               "alignment": 16,
               "tranmap": null,
@@ -3357,7 +3357,7 @@
           {
             "widget":
             {
-              "x": 2,
+              "x": 0,
               "y": 0,
               "alignment": 16,
               "tranmap": null,
@@ -3372,7 +3372,7 @@
           {
             "widget":
             {
-              "x": 2,
+              "x": 0,
               "y": 192,
               "alignment": 16,
               "tranmap": null,

diff --git a/base/all-all/sbhuddef.lmp b/base/all-all/sbhuddef.lmp
@@ -157,7 +157,7 @@
       {
         "widget":
         {
-          "x": 320,
+          "x": 318,
           "y": 8,
           "alignment": 34,
           "tranmap": null,
@@ -171,7 +171,7 @@
       {
         "widget":
         {
-          "x": 320,
+          "x": 318,
           "y": 0,
           "alignment": 34,
           "tranmap": null,
@@ -185,7 +185,7 @@
       {
         "widget":
         {
-          "x": 0,
+          "x": 2,
           "y": 8,
           "alignment": 0,
           "tranmap": null,
@@ -199,7 +199,7 @@
       {
         "widget":
         {
-          "x": 320,
+          "x": 318,
           "y": 167,
           "alignment": 42,
           "tranmap": null,

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