From 131bc522be92901321e89896a00d548f4b55ac4f Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Sat, 15 Feb 2020 21:25:55 +0100
Subject: Revert "use the element for sfx"

---
 webAO/client.html | 3 ++-
 webAO/client.js   | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'webAO')

diff --git a/webAO/client.html b/webAO/client.html
index 119e3d8..2152ddc 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -284,7 +284,8 @@
 			<audio id="client_musicaudio" onvolumechange="changeMusicVolume()" controls loop></audio>
 
 			<p>SFX</p>
-			<audio id="client_sfxaudio" onvolumechange="changeSFXVolume()" controls></audio>
+			<input id="client_svolume" class="long" type="range" min="0" max="100" value="70"
+					onchange="changeSFXVolume()">
 
 			<p>Blip</p>
 			<input id="client_bvolume" class="long" type="range" min="0" max="100" value="60"
diff --git a/webAO/client.js b/webAO/client.js
index f0a74d8..dda1c63 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -373,7 +373,7 @@ class Client extends EventEmitter {
 
 		document.getElementById("client_musicaudio").volume = getCookie("musicVolume");
 		changeMusicVolume();
-		document.getElementById("client_sfxaudio").volume = getCookie("sfxVolume");
+		document.getElementById("client_svolume").value = getCookie("sfxVolume");
 		changeSFXVolume();
 		document.getElementById("client_bvolume").value = getCookie("blipVolume");
 		changeBlipVolume();
@@ -1184,7 +1184,7 @@ class Viewport {
 			.forEach(channel => channel.volume = 0.5);
 		this.currentBlipChannel = 0;
 
-		this.sfxaudio = document.getElementById("client_sfxaudio");
+		this.sfxaudio = new Audio(AO_HOST + "sounds/general/sfx-blipmale.wav");
 		this.sfxplayed = 0;
 
 		this.shoutaudio = new Audio();
@@ -1851,8 +1851,9 @@ window.changeMusicVolume = changeMusicVolume;
  * Triggered by the sound effect volume slider.
  */
 export function changeSFXVolume() {
-	viewport.shoutaudio.volume = document.getElementById("client_sfxaudio").volume;
-	setCookie("sfxVolume", document.getElementById("client_sfxaudio").volume);
+	viewport.sfxaudio.volume = document.getElementById("client_svolume").value / 100;
+	viewport.shoutaudio.volume = document.getElementById("client_svolume").value / 100;
+	setCookie("sfxVolume", document.getElementById("client_svolume").value);
 }
 window.changeSFXVolume = changeSFXVolume;
 
-- 
cgit