aboutsummaryrefslogtreecommitdiff
path: root/webAO
diff options
context:
space:
mode:
Diffstat (limited to 'webAO')
-rw-r--r--webAO/client.html6
-rw-r--r--webAO/client.js18
2 files changed, 8 insertions, 16 deletions
diff --git a/webAO/client.html b/webAO/client.html
index ad42946..197d77e 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -335,11 +335,11 @@
<option value="soj">DD / SoJ</option>
<option value="cyber">Cyber (WIP)</option>
</select>
+ <!--
<br>
<br>
- <label for="client_modcall">Modcall sound:</label>
- <select id="client_modcall" name="client_modcall" onchange="changeModcall()">
- </select>
+ <button id="client_modcall" onclick="modcall_test()">Test modcall</button>
+ -->
<br>
<br>
<p>Ini editing (experimental)</p>
diff --git a/webAO/client.js b/webAO/client.js
index e6c0c29..796905d 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -385,13 +385,6 @@ class Client extends EventEmitter {
evidence_select.add(new Option(evidence));
});
- // Load sfx for modcalls
- const modcall_select = document.getElementById("client_modcall");
- sfx_arr.forEach(evidence => {
- modcall_select.add(new Option(evidence));
- });
- document.getElementById("client_modcall").value = getCookie("modcall_sfx") || "sfx-gallery.wav";
-
// Read cookies and set the UI to its values
document.getElementById("OOC_name").value = getCookie("OOC_name") || "web"+parseInt(Math.random()*100+10);
@@ -980,7 +973,7 @@ class Client extends EventEmitter {
}
/**
- * Handles a call mod message.
+ * Handles a modcall
* @param {Array} args packet arguments
*/
handleZZ(args) {
@@ -989,11 +982,10 @@ class Client extends EventEmitter {
if (oocLog.scrollTop > oocLog.scrollHeight - 60) {
oocLog.scrollTop = oocLog.scrollHeight;
}
- const sfxname = document.getElementById("client_modcall").value;
viewport.sfxaudio.pause();
const oldvolume = viewport.sfxaudio.volume;
viewport.sfxaudio.volume = 1;
- viewport.sfxaudio.src = AO_HOST + "sounds/general/" + sfxname + ".wav";
+ viewport.sfxaudio.src = AO_HOST + "sounds/general/sfx-gallery.wav";
viewport.sfxaudio.play();
viewport.sfxaudio.volume = oldvolume;
}
@@ -2069,10 +2061,10 @@ window.reloadTheme = reloadTheme;
/**
* Triggered by the modcall sfx dropdown
*/
-export function changeModcall() {
- setCookie("modcall_sfx", document.getElementById("client_modcall").value);
+export function modcall_test() {
+ client.handleZZ("test#test".split("#"));
}
-window.changeModcall = changeModcall;
+window.modcall_test = modcall_test;
/**
* Triggered by the ini button.