zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-26 04:31:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- always show iwad picker, offer option for forks to hide picker by default. this commit was intentionally done in a way to cause merge conflicts so as to force fork maintainers to pay attention to the new option in version.h

Browse source
This commit is contained in:
Rachael Alexanderson 2024-05-03 09:45:20 -04:00
parent 4bf2fb0ef8
commit bcad040fd3
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/engine/i_interface.cpp
View file

@ -4,6 +4,7 @@
#include "startupinfo.h"
#include "c_cvars.h"
#include "gstrings.h"
#include "version.h"
static_assert(sizeof(void*) == 8, "32 builds are not supported");
@ -23,7 +24,7 @@ bool pauseext;
FStartupInfo GameStartupInfo;
CVAR(Bool, queryiwad, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
CVAR(Bool, queryiwad, QUERYIWADDEFAULT, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
CVAR(String, defaultiwad, "", CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
CVAR(Bool, vid_fps, false, 0)

4
src/d_iwad.cpp
View file

@ -728,7 +728,7 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
int pick = 0;
// We got more than one so present the IWAD selection box.
if (picks.Size() > 1)
if (picks.Size() > 0)
{
// Locate the user's prefered IWAD, if it was found.
if (defaultiwad[0] != '\0')
@ -743,7 +743,7 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
}
}
}
if (picks.Size() > 1)
if (picks.Size() > 0)
{
if (!havepicked)
{

3
src/version.h
View file

@ -101,8 +101,11 @@ const char *GetVersionString();
#define GAMENAME "GZDoom"
#define WGAMENAME L"GZDoom"
#define GAMENAMELOWERCASE "gzdoom"
#define QUERYIWADDEFAULT true
#define FORUM_URL "http://forum.zdoom.org/"
#define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2"
// For QUERYIWADDEFAULT: Set to 'true' to always show dialog box on startup by default, 'false' to disable.
// Should set to 'false' for standalone games, and set to 'true' for regular source port forks that are meant to run any game.
#if defined(__APPLE__) || defined(_WIN32)
#define GAME_DIR GAMENAME