diff options
| author | sD <stoned@derpymail.org> | 2020-02-15 21:15:03 +0100 |
|---|---|---|
| committer | sD <stoned@derpymail.org> | 2020-02-15 21:15:03 +0100 |
| commit | 842dc4b9c7652058bf4214c28468f608fd1215c0 (patch) | |
| tree | e21f20fd2062f4cabcef8161d47ebe1a7b07c38c /webAO | |
| parent | 2b890c9e54742d09a841b4ef3b5cf200397e80eb (diff) | |
Revert "change blips too"
This reverts commit 0a21911b3cc3f8de444c5b1da80c742cd74c611f.
Diffstat (limited to 'webAO')
| -rw-r--r-- | webAO/client.html | 6 | ||||
| -rw-r--r-- | webAO/client.js | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/webAO/client.html b/webAO/client.html index 3c06689..119e3d8 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -287,10 +287,8 @@ <audio id="client_sfxaudio" onvolumechange="changeSFXVolume()" controls></audio> <p>Blip</p> - <audio id="client_blipaudio0" onvolumechange="changeBlipVolume()" controls></audio> - <audio id="client_blipaudio1"></audio> - <audio id="client_blipaudio2"></audio> - <audio id="client_blipaudio3"></audio> + <input id="client_bvolume" class="long" type="range" min="0" max="100" value="60" + onchange="changeBlipVolume()"> <br> <br> <button id="char_change" alt="Change" class="client_button hover_button" onclick="changeCharacter()">Change diff --git a/webAO/client.js b/webAO/client.js index 6aaa8e9..f0a74d8 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -375,7 +375,7 @@ class Client extends EventEmitter { changeMusicVolume(); document.getElementById("client_sfxaudio").volume = getCookie("sfxVolume"); changeSFXVolume(); - document.getElementById("client_blipaudio0").value = getCookie("blipVolume"); + document.getElementById("client_bvolume").value = getCookie("blipVolume"); changeBlipVolume(); document.getElementById("ic_chat_name").value = getCookie("ic_chat_name"); @@ -1179,11 +1179,9 @@ class Viewport { // Allocate multiple blip audio channels to make blips less jittery - this.blipChannels = [document.getElementById("client_blipaudio0"), - document.getElementById("client_blipaudio1"), - document.getElementById("client_blipaudio2"), - document.getElementById("client_blipaudio3")]; - + this.blipChannels = new Array(6); + this.blipChannels.fill(new Audio(AO_HOST + "sounds/general/sfx-blipmale.wav")) + .forEach(channel => channel.volume = 0.5); this.currentBlipChannel = 0; this.sfxaudio = document.getElementById("client_sfxaudio"); @@ -1862,8 +1860,8 @@ window.changeSFXVolume = changeSFXVolume; * Triggered by the blip volume slider. */ export function changeBlipVolume() { - viewport.blipVolume = document.getElementById("client_blipaudio0").volume; - setCookie("blipVolume", document.getElementById("client_blipaudio0").volume); + viewport.blipVolume = document.getElementById("client_bvolume").value / 100; + setCookie("blipVolume", document.getElementById("client_bvolume").value); } window.changeBlipVolume = changeBlipVolume; |