OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added multiplayer tab for launcher + backend improvements

Browse source 
Adds a multiplayer tab to allow hosting and joining games from within the GZDoom launcher rather than needed to use the command line. This has its own set of defaults independent from the main play page which necessitated rewriting how this information is passed and stored in the backend. A startup info struct is now passed back which has its defaults set from the cvars and then propagates any changes to it back to the defaults after selection is complete, making it much simpler to interface with the engine defaults.
This commit is contained in:
Boondorl 2025-07-02 19:56:17 -04:00 • committed by Ricardo Luís Vaz Silva
commit 9701bfaa5c
18 changed files with 1006 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/d_iwad.cpp
View file

@ -52,7 +52,6 @@
#include "gstrings.h"
EXTERN_CVAR(Bool, queryiwad);
EXTERN_CVAR(String, defaultiwad);
EXTERN_CVAR(Bool, disableautoload)
EXTERN_CVAR(Bool, autoloadlights)
EXTERN_CVAR(Bool, autoloadbrightmaps)
@ -584,8 +583,6 @@ FString FIWadManager::IWADPathFileSearch(const FString &file)
return "";
}
CVAR(String, extra_args, "", CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char *iwad, const char *zdoom_wad, const char *optional_wad)
{
const char *iwadparm = Args->CheckValue ("-iwad");
@ -759,69 +756,37 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
// Present the IWAD selection box.
bool alwaysshow = (queryiwad && !Args->CheckParm("-iwad") && !foundprio);
if (alwaysshow || picks.Size() > 1)
if (!havepicked && (alwaysshow || picks.Size() > 1))
{
// Locate the user's prefered IWAD, if it was found.
if (defaultiwad[0] != '\0')
TArray<WadStuff> wads;
for (auto & found : picks)
{
for (unsigned i = 0; i < picks.Size(); ++i)
{
FString &basename = mIWadInfos[picks[i].mInfoIndex].Name;
if (basename.CompareNoCase(defaultiwad) == 0)
{
pick = i;
break;
}
}
WadStuff stuff;
stuff.Name = mIWadInfos[found.mInfoIndex].Name;
stuff.Path = ExtractFileBase(found.mFullPath.GetChars());
wads.Push(stuff);
}
if (alwaysshow || picks.Size() > 1)
int flags = 0;
if (disableautoload) flags |= 1;
if (autoloadlights) flags |= 2;
if (autoloadbrightmaps) flags |= 4;
if (autoloadwidescreen) flags |= 8;
FStartupSelectionInfo info = FStartupSelectionInfo(wads, *Args, flags);
if (I_PickIWad(queryiwad, info))
{
if (!havepicked)
{
TArray<WadStuff> wads;
for (auto & found : picks)
{
WadStuff stuff;
stuff.Name = mIWadInfos[found.mInfoIndex].Name;
stuff.Path = ExtractFileBase(found.mFullPath.GetChars());
wads.Push(stuff);
}
int flags = 0;;
if (disableautoload) flags |= 1;
if (autoloadlights) flags |= 2;
if (autoloadbrightmaps) flags |= 4;
if (autoloadwidescreen) flags |= 8;
FString extraArgs = *extra_args;
pick = I_PickIWad(&wads[0], (int)wads.Size(), queryiwad, pick, flags, extraArgs);
if (pick >= 0)
{
extraArgs.StripLeftRight();
extra_args = extraArgs.GetChars();
if(extraArgs.Len() > 0)
{
Args->AppendArgsString(extraArgs);
}
disableautoload = !!(flags & 1);
autoloadlights = !!(flags & 2);
autoloadbrightmaps = !!(flags & 4);
autoloadwidescreen = !!(flags & 8);
// The newly selected IWAD becomes the new default
defaultiwad = mIWadInfos[picks[pick].mInfoIndex].Name.GetChars();
}
else
{
return -1;
}
havepicked = true;
}
pick = info.SaveInfo();
disableautoload = !!(info.DefaultStartFlags & 1);
autoloadlights = !!(info.DefaultStartFlags & 2);
autoloadbrightmaps = !!(info.DefaultStartFlags & 4);
autoloadwidescreen = !!(info.DefaultStartFlags & 8);
}
else
{
return -1;
}
havepicked = true;
}
// zdoom.pk3 must always be the first file loaded and the IWAD second.