Merge branch 'upstream-merge-2'

.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__

.gitignore

@@ -14,3 +14,5 @@ CMakeSettings.json
 
 # clangd
 /.cache/
+CMakeFiles/
+src/CMakeFiles/

CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ## Changes
 
+- **Merged changes from [Woof! post-15.0.1]**, note:
+  - Replaced `fullscreen_hud_type` with `use_nughud`, with the NUGHUD now replacing the second-to-last HUD
+  - Removed `fuzzdark_mode` in favor of Woof!'s `fuzzmode` (_Refraction_ is equivalent to _Selective Fuzz Darkening_)
+  - Removed `comp_blazing2`; its functionality has been integrated into `comp_blazing`
 - **Improved interpolation of weapon sprites**
 - **Applied weapon inertia when firing** (added `weapon_inertia_fire` CVAR to disable it)
 - **Lowered `weapon_inertia_scale_pct` limit to -200**

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()
@@ -76,6 +77,16 @@ check_c_source_compiles("
   "
   HAVE__DIV64
 )
+check_c_source_compiles("
+    typedef float vec __attribute__((ext_vector_type(4)));
+    int main()
+    {
+        vec a = (vec){0, 1, 2, 3};
+        return 0;
+    }
+  "
+  HAVE_EXT_VECTOR_TYPE
+)
 
 option(CMAKE_FIND_PACKAGE_PREFER_CONFIG
        "Lookup package config files before using find modules" ON)

README.md

@@ -164,7 +164,6 @@ All of these are CFG-only, so their CVAR names are included.
 - Attackers face fuzzy targets straight (`comp_faceshadow`)
 - Fix lopsided Icon of Sin explosions (`comp_iosdeath`)
 - Permanent IDCHOPPERS invulnerability (`comp_choppers`)
-- Blazing doors reopen with wrong sound (`comp_blazing2`) [p.f. Crispy Doom]
 - Manually toggled moving doors are silent (`comp_manualdoor`) [p.f. Crispy Doom]
 - Corrected switch sound source (`comp_switchsource`) [p.f. Crispy Doom]
 - Chaingun makes two sounds with one bullet (`comp_cgundblsnd`)
@@ -260,7 +259,7 @@ The Nugget Doom source code is available at GitHub: <https://github.com/MrAlaux/
 
 The following build system and libraries need to be installed:
 
- * [CMake](https://cmake.org) (>= 3.9)
+ * [CMake](https://cmake.org) (>= 3.15)
  * [SDL2](https://github.com/libsdl-org/SDL/tree/SDL2) (>= 2.0.18)
  * [SDL2_net](https://github.com/libsdl-org/SDL_net)
  * [openal-soft](https://github.com/kcat/openal-soft) (>= 1.22.0 for PC Speaker emulation)
@@ -330,7 +329,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;  
@@ -341,7 +339,8 @@ Copyright:
  © 2022-2024 ceski;  
  © 2023 Andrew Apted;  
  © 2023 liPillON;  
- © 2024 pvictress.   
+ © 2024 pvictress;  
+ © 2025 Guilherme Miranda.  
 License: [GPL-2.0+](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
 Files: `src/i_flickstick.*, src/i_gyro.*`  
@@ -356,10 +355,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.*`  

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}"