From 420b31f4603b83dad48ba0082d94f73bfaee2f99 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Thu, 13 Feb 2020 10:55:03 +0100
Subject: add js

---
 webAO/client.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'webAO/client.js')

diff --git a/webAO/client.js b/webAO/client.js
index 03a72cf..ba9245d 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -1869,6 +1869,16 @@ export function reloadTheme() {
 }
 window.reloadTheme = reloadTheme;
 
+/**
+ * Triggered by the ini button.
+ */
+export function iniedit() {
+	const ininame = document.getElementById("client_ininame").value;
+	client.handleCharacterInfo(ininame.split("&"),client.charID);
+	client.handlePV(("0#CID#" + client.charID).split("#"));
+}
+window.iniedit = iniedit;
+
 /**
  * Triggered when a character icon is clicked in the character selection menu.
  * @param {MouseEvent} event
-- 
cgit 


From 60431a062e262bfc92d61c933d54e5492d6b7c25 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Thu, 13 Feb 2020 13:48:53 +0100
Subject: fix ini js

---
 webAO/client.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'webAO/client.js')

diff --git a/webAO/client.js b/webAO/client.js
index ba9245d..3e30e03 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -1100,19 +1100,19 @@ class Client extends EventEmitter {
 
 	/**
 	 * Handles the server's assignment of a character for the player to use.
+	 * PV # playerID (unused) # CID # character ID
 	 * @param {Array} args packet arguments
 	 */
 	async handlePV(args) {
 		this.charID = Number(args[3]);
-
 		document.getElementById("client_charselect").style.display = "none";
 
 		const me = this.character;
 		this.selectedEmote = -1;
 		const emotes = this.emotes;
 		const emotesList = document.getElementById("client_emo");
-		emotesList.innerHTML = ""; // Clear emote box
 		emotesList.style.display = "";
+		emotesList.innerHTML = ""; // Clear emote box
 		const ini = me.inifile;
 		me.side = ini.options.side;
 		updateActionCommands(me.side);
@@ -1872,10 +1872,11 @@ window.reloadTheme = reloadTheme;
 /**
  * Triggered by the ini button.
  */
-export function iniedit() {
+export async function iniedit() {
 	const ininame = document.getElementById("client_ininame").value;
-	client.handleCharacterInfo(ininame.split("&"),client.charID);
-	client.handlePV(("0#CID#" + client.charID).split("#"));
+	const inicharID = client.charID;
+	await client.handleCharacterInfo(ininame.split("&"),inicharID);
+	client.handlePV(("PV#0#CID#" + inicharID).split("#"));
 }
 window.iniedit = iniedit;
 
-- 
cgit