From 9b16ff9c582a5a3e1bb7a766eabfbc718bad2808 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Sun, 16 Feb 2020 19:29:31 +0100
Subject: set defaults for cookies

---
 webAO/client.html |  4 ++--
 webAO/client.js   | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/webAO/client.html b/webAO/client.html
index dd6531a..7c6e2b3 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -285,11 +285,11 @@
 			<audio id="client_musicaudio" onvolumechange="changeMusicVolume()" controls loop></audio>
 
 			<p>SFX</p>
-			<input id="client_svolume" class="long" type="range" min="0" max="100" value="70"
+			<input id="client_svolume" class="long" type="range" min="0" max="100" value="100"
 					onchange="changeSFXVolume()">
 
 			<p>Blip</p>
-			<input id="client_bvolume" class="long" type="range" min="0" max="100" value="60"
+			<input id="client_bvolume" class="long" type="range" min="0" max="100" value="100"
 					onchange="changeBlipVolume()">
 			<br>
 			<br>
diff --git a/webAO/client.js b/webAO/client.js
index 04797da..77c75c0 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -358,24 +358,19 @@ class Client extends EventEmitter {
 		document.getElementById("client_version").innerText = "version " + version;
 
 		// Read cookies and set the UI to its values
-		document.getElementById("OOC_name").value = getCookie("OOC_name");
-		if (document.getElementById("OOC_name").value === "") {
-			document.getElementById("OOC_name").value = "web" + this.playerID;
-		}
+		document.getElementById("OOC_name").value = getCookie("OOC_name") || "web"+parseInt(Math.random()*100+10);
 
 		// Read cookies and set the UI to its values
-		var cookietheme = getCookie("theme");
-		if (cookietheme === "") {
-			cookietheme = "default";
-		}
+		var cookietheme = getCookie("theme") || "default";
+
 		document.querySelector('#client_themeselect [value="' + cookietheme + '"]').selected = true;
 		reloadTheme();
 
-		document.getElementById("client_musicaudio").volume = getCookie("musicVolume");
+		document.getElementById("client_musicaudio").volume = getCookie("musicVolume") || 1;
 		changeMusicVolume();
-		document.getElementById("client_svolume").value = getCookie("sfxVolume");
+		document.getElementById("client_svolume").value = getCookie("sfxVolume") || 100;
 		changeSFXVolume();
-		document.getElementById("client_bvolume").value = getCookie("blipVolume");
+		document.getElementById("client_bvolume").value = getCookie("blipVolume") || 100;
 		changeBlipVolume();
 
 		document.getElementById("ic_chat_name").value = getCookie("ic_chat_name");
-- 
cgit