From 7bfd5c90b832ec5816ecbde623214b57bb121484 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 10 Jun 2024 01:29:34 -0500
Subject: [PATCH] Add support for mods to web client

ioquake3.html?fs_game=missionpack will run Team Arena when not using
--preload-file.
---
 code/web/client-config.json | 11 ++++++++++
 code/web/client.html        | 41 +++++++++++++++++++++++--------------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/code/web/client-config.json b/code/web/client-config.json
index 3dc05b98..eddf35db 100644
--- a/code/web/client-config.json
+++ b/code/web/client-config.json
@@ -15,6 +15,17 @@
             {"src": "baseq3/vm/ui.qvm", "dst": "/baseq3/vm"}
         ]
     },
+    "missionpack": {
+        "files": [
+            {"src": "missionpack/pak0.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak1.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak2.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak3.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/vm/cgame.qvm", "dst": "/missionpack/vm"},
+            {"src": "missionpack/vm/qagame.qvm", "dst": "/missionpack/vm"},
+            {"src": "missionpack/vm/ui.qvm", "dst": "/missionpack/vm"}
+        ]
+    },
     "demoq3": {
         "_comment": "Copy baseq3/vm/*.qvm to demoq3/vm/ as the Quake 3 demo QVMs are not compatible. However the botfiles are not fully compatible with newer QVMs.",
         "files": [
diff --git a/code/web/client.html b/code/web/client.html
index a354ad2c..a1cf00fa 100644
--- a/code/web/client.html
+++ b/code/web/client.html
@@ -34,11 +34,15 @@ if (window.location.protocol === 'file:') throw new Error(`Unfortunately browser
 // First set up the command line arguments and the Emscripten filesystem.
 const urlParams = new URLSearchParams(window.location.search);
 const com_basegame = urlParams.get('com_basegame') || BASEGAME;
+const fs_basegame = urlParams.get('fs_basegame') || '';
+const fs_game = urlParams.get('fs_game') || '';
 let generatedArguments = `
     +set sv_pure 0
     +set net_enabled 0
     +set r_mode -2
     +set com_basegame "${com_basegame}"
+    +set fs_basegame "${fs_basegame}"
+    +set fs_game "${fs_game}"
 `;
 // Note that unfortunately "+" needs to be encoded as "%2b" in URL query strings or it will be stripped by the browser.
 const queryArgs = urlParams.get('args');
@@ -81,21 +85,28 @@ ioquake3({
         module.addRunDependency('setup-ioq3-filesystem');
         try {
             const config = await configPromise;
-            const gamedir = com_basegame;
-            if (config[gamedir] === null
-             || config[gamedir].files === null) {
-                console.warn(`Game directory '${gamedir}' cannot be used. It must have files listed in ${configFilename}.`);
-            }
-            const files = config[gamedir].files;
-            const fetches = files.map(file => fetch(new URL(file.src, dataURL)));
-            for (let i = 0; i < files.length; i++) {
-                const response = await fetches[i];
-                if (!response.ok) continue;
-                const data = await response.arrayBuffer();
-                let name = files[i].src.match(/[^/]+$/)[0];
-                let dir = files[i].dst;
-                module.FS.mkdirTree(dir);
-                module.FS.writeFile(`${dir}/${name}`, new Uint8Array(data));
+            const gamedirs = [com_basegame,fs_basegame,fs_game];
+            for (let g = 0; g < gamedirs.length; g++) {
+                const gamedir = gamedirs[g];
+                if (gamedir === '') {
+                    continue;
+                }
+                if (config[gamedir] === null
+                 || config[gamedir].files === null) {
+                    console.warn(`Game directory '${gamedir}' cannot be used. It must have files listed in ${configFilename}.`);
+                    continue;
+                }
+                const files = config[gamedir].files;
+                const fetches = files.map(file => fetch(new URL(file.src, dataURL)));
+                for (let i = 0; i < files.length; i++) {
+                    const response = await fetches[i];
+                    if (!response.ok) continue;
+                    const data = await response.arrayBuffer();
+                    let name = files[i].src.match(/[^/]+$/)[0];
+                    let dir = files[i].dst;
+                    module.FS.mkdirTree(dir);
+                    module.FS.writeFile(`${dir}/${name}`, new Uint8Array(data));
+                }
             }
         } finally {
             module.removeRunDependency('setup-ioq3-filesystem');