35 lines
985 B
Diff
35 lines
985 B
Diff
|
From 698d335ff71d4ad4c830d566ab445ee43aa7c815 Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Stebbins <jstebbins@jetheaddev.com>
|
||
|
|
Date: Thu, 23 Feb 2023 07:32:58 -0700
|
||
|
|
Subject: [PATCH 38/51] Allow GAMEINFO LOAD to load directories
|
||
|
|
|
||
|
|
Addresses part of enhancement issue #2011
|
||
|
|
---
|
||
|
|
src/d_main.cpp | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/d_main.cpp b/src/d_main.cpp
|
||
|
|
index 5bf8e8928..b34c480ff 100644
|
||
|
|
--- a/src/d_main.cpp
|
||
|
|
+++ b/src/d_main.cpp
|
||
|
|
@@ -1773,6 +1773,7 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
|
||
|
|
FScanner sc;
|
||
|
|
FString iwad;
|
||
|
|
int pos = 0;
|
||
|
|
+ bool isDir;
|
||
|
|
|
||
|
|
const char *lastSlash = strrchr (fn, '/');
|
||
|
|
|
||
|
|
@@ -1806,7 +1807,7 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
|
||
|
|
{
|
||
|
|
checkpath = sc.String;
|
||
|
|
}
|
||
|
|
- if (!FileExists(checkpath))
|
||
|
|
+ if (!DirEntryExists(checkpath, &isDir))
|
||
|
|
{
|
||
|
|
pos += D_AddFile(pwads, sc.String, true, pos, GameConfig);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|