id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't lookup Steam and GOG D3BFG paths by default.

Browse source 
This breaks development builds however you can set this behaviour by
setting +set sys_useSteamPath 1 or +set sys_useGOGPath 1
This commit is contained in:
Robert Beckebans 2021-06-04 13:06:34 +02:00
parent 6ee08ed8a4
commit c705e894fd
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES.md
View file

@ -357,7 +357,7 @@ Using the models argument will also export all needed models by entity declarati
* Fixed bug that GOG builds default to Japanese instead of English
* Support for Steam and GOG base path detection for Windows
* Support for Steam and GOG base path detection for Windows if sys_useSteamPath or sys_useGOGPath is set to 1 (default 0)
* Changed CMake MSVC setup to enable debugging without manually changing paths (thanks to Patrick Raynor)

3
neo/sys/win32/win_local.h
View file

@ -125,6 +125,9 @@ typedef struct
static idCVar win_timerUpdate;
static idCVar win_allowMultipleInstances;
static idCVar sys_useSteamPath;
static idCVar sys_useGOGPath;
CRITICAL_SECTION criticalSections[MAX_CRITICAL_SECTIONS];
HINSTANCE hInstDI; // direct input

8
neo/sys/win32/win_main.cpp
View file

@ -60,6 +60,10 @@ idCVar Win32Vars_t::win_viewlog( "win_viewlog", "0", CVAR_SYSTEM | CVAR_INTEGER,
idCVar Win32Vars_t::win_timerUpdate( "win_timerUpdate", "0", CVAR_SYSTEM | CVAR_BOOL, "allows the game to be updated while dragging the window" );
idCVar Win32Vars_t::win_allowMultipleInstances( "win_allowMultipleInstances", "0", CVAR_SYSTEM | CVAR_BOOL, "allow multiple instances running concurrently" );
// RB
idCVar Win32Vars_t::sys_useSteamPath( "sys_useSteamPath", "0", CVAR_SYSTEM | CVAR_BOOL | CVAR_ARCHIVE, "Look for Steam Doom 3 BFG path instead of local installation" );
idCVar Win32Vars_t::sys_useGOGPath( "sys_useGOGPath", "0", CVAR_SYSTEM | CVAR_BOOL | CVAR_ARCHIVE, "Look for GOG Doom 3 BFG path instead of local installation" );
Win32Vars_t win32;
static char sys_cmdline[MAX_STRING_CHARS];
@ -728,7 +732,7 @@ const char* Sys_DefaultBasePath()
// Try the Steam path next
basepath = Sys_SteamBasePath();
if( basepath.Length() )
if( basepath.Length() && win32.sys_useSteamPath.GetBool() )
{
testbase = basepath;
testbase += "/";
@ -745,7 +749,7 @@ const char* Sys_DefaultBasePath()
// Try the GOG.com path next
basepath = Sys_GogBasePath();
if( basepath.Length() )
if( basepath.Length() && win32.sys_useGOGPath.GetBool() )
{
testbase = basepath;
testbase += "/";

3
zip-RBDOOM-3-BFG-bakedlightdata.bat
View file

@ -1,2 +1,3 @@
7z a RBDOOM-3-BFG-1.3.0.31-base_bakedlightdata.7z -r base/env/ base/maps/*.lightgrid -x!generated
7z a RBDOOM-3-BFG-1.3.0.36-baseSP_bakedlightdata.7z -r base/env/ base/maps/*.lightgrid -x!generated
REM sha256sum RBDOOM-3-BFG-1.3.0.36-base_bakedlightdata.7z >> SHA256SUMS.txt
pause