updating docs

briancullinan2 · Jul 10, 2024 · e0d7d20 · e0d7d20
1 parent 8790143
commit e0d7d20
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/docs/quake3e.wasm b/docs/quake3e.wasm
diff --git a/docs/sys_net.js b/docs/sys_net.js
@@ -627,6 +627,7 @@ function CL_Download(cmd, name, auto) {
   let dlURL = addressToString(Cvar_VariableString(stringToAddress('cl_dlURL')))
   let gamedir = addressToString(FS_GetCurrentGameDir())
   let nameStr = addressToString(name)
+  let basegame = addressToString(Cvar_VariableString(stringToAddress('fs_basegame')))
   let localName = nameStr
   if (localName[0] == '/')
     localName = localName.substring(1)
@@ -689,7 +690,17 @@ function CL_Download(cmd, name, auto) {
               nameStr = 'maps/' + nameStr + '.bsp'
             }
             return responseData
-          })])).filter(f => f)[0]
+          }),
+          await Com_DL_Begin(localName + '.bsp', basegame + '/pak0.pk3dir/maps/' + localName + '.bsp')
+          .then(responseData => {
+            if(responseData && !nameStr.match(/\.bsp$/)) {
+              mapname = nameStr
+              nameStr = 'maps/' + nameStr + '.bsp'
+            }
+            return responseData
+          }),
+
+        ])).filter(f => f)[0]
       } else {
         // valid from disk
         responseData = result.contents

diff --git a/docs/sys_snd.js b/docs/sys_snd.js
@@ -15,6 +15,11 @@ function S_CodecLoad (name, info) {
   if(filenameStr.length == 0) {
     return 0
   }
+  if(typeof REMOTE_SOUNDS[filenameStr] != 'undefined'
+    && !REMOTE_SOUNDS[filenameStr]
+  ) {
+    return 0
+  }
   if(!filenameStr.endsWith('.ogg')) {
     filenameStr = filenameStr.replace(/\..*?$/, '.ogg')
   }
@@ -58,6 +63,9 @@ function S_CodecLoad (name, info) {
     Promise.resolve(Com_DL_Begin(gamedir + '/' + remoteFile, '/' + gamedir + '/' + remoteFile + '?alt')
         .then(function (responseData) {
           Com_DL_Perform(gamedir + '/' + remoteFile, remoteFile, responseData)
+          if(!responseData) {
+            REMOTE_SOUNDS[filenameStr] = false
+          }
         }))
   }
 

diff --git a/docs/sys_web.js b/docs/sys_web.js
@@ -235,7 +235,7 @@ function Sys_Return() {
 
 function Sys_Exit(code) {
 	SYS.exited = true
-	GLimp_Shutdown()
+	GLimp_Shutdown(true)
 	NET_Shutdown()
 	if(SYS.frameInterval) {
 		clearInterval(SYS.frameInterval)
@@ -244,7 +244,6 @@ function Sys_Exit(code) {
 	if(code == 0) {
 		Sys_Return()
 	}
-	SDL_ShowCursor()
 	if(	GL.canvas ) {
 		GL.canvas.remove()
 	}