From fb660fa3c196754393b437ac26bd451a1699b07c Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Thu, 5 Dec 2024 04:09:51 -0500 Subject: [PATCH] - allow forks to set OPTIONALWAD to (null) to disable searching for it. --- src/d_iwad.cpp | 2 +- src/version.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 0f25f239f1..bc443ef8c1 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -824,7 +824,7 @@ int FIWadManager::IdentifyVersion (std::vector&wadfiles, const char // [SP] Load non-free assets if available. This must be done before the IWAD. int iwadnum = 1; - if (D_AddFile(wadfiles, optional_wad, true, -1, GameConfig)) + if (optional_wad && D_AddFile(wadfiles, optional_wad, true, -1, GameConfig)) { iwadnum++; } diff --git a/src/version.h b/src/version.h index ca9cc3e595..c7bdc30720 100644 --- a/src/version.h +++ b/src/version.h @@ -93,6 +93,7 @@ const char *GetVersionString(); // This is so that derivates can use the same savegame versions without worrying about engine compatibility #define GAMESIG "GZDOOM" #define BASEWAD "gzdoom.pk3" +// Set OPTIONALWAD to "" (null) to disable searching for it #define OPTIONALWAD "game_support.pk3" #define GZDOOM 1 #define VR3D_ENABLED