From 506d435b6f43c4942031d0f1c04b9c0cfce90430 Mon Sep 17 00:00:00 2001
From: "caleb.mabry.15@cnu.edu" <caleb.mabry.15@cnu.edu>
Date: Mon, 14 Mar 2022 22:03:20 -0400
Subject: Final fix for overlapping chars

---
 webAO/client/setEmote.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'webAO/client')

diff --git a/webAO/client/setEmote.js b/webAO/client/setEmote.js
index 16c95be..862e81a 100644
--- a/webAO/client/setEmote.js
+++ b/webAO/client/setEmote.js
@@ -10,22 +10,19 @@ const setEmote = (AO_HOST, client, charactername, emotename, prefix, pair, side)
   const characterFolder = `${AO_HOST}characters/`;
   const acceptedPositions = ['def', 'pro', 'wit'];
   const position = acceptedPositions.includes(side) ? `${side}_` : '';
+  const emoteSelector = document.getElementById(`client_${position}${pairID}_img`)
+  const extensionsMap = [
+    '.gif',
+    '.png',
+    '.apng',
+    '.webp'
+  ];
+  const transparentPNG = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 
-  const gif_s = document.getElementById(`client_${position}${pairID}_gif`);
-  const png_s = document.getElementById(`client_${position}${pairID}_png`);
-  const apng_s = document.getElementById(`client_${position}${pairID}_apng`);
-  const webp_s = document.getElementById(`client_${position}${pairID}_webp`);
-  const extensionsMap = {
-    '.gif': gif_s,
-    '.png': png_s,
-    '.apng': apng_s,
-    '.webp': webp_s,
-  };
-
-  for (const [extension, htmlElement] of Object.entries(extensionsMap)) {
+  for (const extension of extensionsMap) {
     // Hides all sprites before creating a new sprite
     if (client.lastChar !== client.chatmsg.name) {
-      htmlElement.src = transparentPNG;
+      emoteSelector.src = transparentPNG;
     }
     let url;
     if (extension === '.png') {
@@ -35,8 +32,8 @@ const setEmote = (AO_HOST, client, charactername, emotename, prefix, pair, side)
     }
     const exists = fileExistsSync(url);
     if (exists) {
-      htmlElement.src = url;
-      return;
+      emoteSelector.src = url;
+      break;
     }
   }
 };
-- 
cgit