Skip to content

Commit 1958b03

Browse files
committed
engine: add an empty “*daemon” builtin basepak, delete the daemon dpkdir
1 parent 889a806 commit 1958b03

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
displayName: 'Build'
6262
- bash: |
6363
set -e
64-
build/test-ttyclient -pakpath pkg -set fs_basepak daemon -set vm.cgame.type 3
64+
build/test-ttyclient -pakpath pkg -set fs_basepak '*daemon' -set vm.cgame.type 3
6565
displayName: 'Test'
6666
6767
- job: Linux
@@ -130,6 +130,6 @@ jobs:
130130
displayName: 'Build'
131131
- bash: |
132132
set -e
133-
SDL_VIDEODRIVER=offscreen ALSOFT_DRIVERS=null build/test-client -pakpath pkg -set fs_basepak daemon -set vm.cgame.type 3
133+
SDL_VIDEODRIVER=offscreen ALSOFT_DRIVERS=null build/test-client -pakpath pkg -set fs_basepak '*daemon' -set vm.cgame.type 3
134134
condition: "and(succeeded(), eq(variables.TOOLCHAIN_FILE, ''))"
135135
displayName: 'Test'

src/engine/qcommon/files.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,16 @@ bool FS_LoadPak(const Str::StringRef name)
657657
}
658658
}
659659

660+
/* Empty base pak available on all engines.
661+
It makes possible to run the engine without a game,
662+
this way:
663+
./daemon -set fs_basepak '*daemon' */
664+
embeddedFileMap_t engineBasePak = {};
665+
660666
void FS_LoadBasePak()
661667
{
668+
FS::AddBuiltinPak("daemon", ENGINE_VERSION, engineBasePak);
669+
662670
Cmd::Args extrapaks(fs_extrapaks.Get());
663671
for (auto& x: extrapaks) {
664672
if (!FS_LoadPak(x)) {

0 commit comments

Comments
 (0)