Skip to content

Merge latest commit by the Admin #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2025
Merged

Merge latest commit by the Admin #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions neo/framework/FileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3071,12 +3071,12 @@ void idFileSystemLocal::SetupGameDirectories( const char* gameName )
{
AddGameDirectory( fs_basepath.GetString(), gameName );
}
#ifdef PACKAGED
//#ifdef PACKAGED
if (fs_apppath.GetString()[0])
{
AddGameDirectory(fs_apppath.GetString(), gameName);
}
#endif
//#endif
// setup savepath
if( fs_savepath.GetString()[0] )
{
Expand Down Expand Up @@ -3198,12 +3198,12 @@ void idFileSystemLocal::Init()
{
fs_basepath.SetString( Sys_DefaultBasePath() );
}
#ifdef PACKAGED
//#ifdef PACKAGED
if (fs_apppath.GetString()[0] == '\0')
{
fs_apppath.SetString(Sys_DefaultAppPath());
}
#endif
//#endif
if( fs_savepath.GetString()[0] == '\0' )
{
fs_savepath.SetString( Sys_DefaultSavePath() );
Expand Down
3 changes: 3 additions & 0 deletions neo/sys/posix/posix_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ const char* Sys_DefaultAppPath()
struct stat buf;
if (stat(DEFAULT_BASEPATH"/base/wads/newopt.wad", &buf) == -1)
{
if (stat(DEFAULT_FLAT_BASEPATH"/base/wads/newopt.wad", &buf) == -1) {
return Sys_EXEPath();
}
return DEFAULT_FLAT_BASEPATH;
}
return DEFAULT_BASEPATH;
Expand Down
Loading