From 4dc891716ba6fb33dc35e9908283c1b6b9755efd Mon Sep 17 00:00:00 2001
From: Osmium Sorcerer <os@sof.beauty>
Date: Mon, 16 Mar 2026 15:59:07 +0000
Subject: Remove hardcoded (a) and (b) emote subdirectories

Note: this is an old commit that was relevant prior to 10b413c
("Add asset preloading system for IC message rendering")

WebAO assumes every character has an idle and talking animations which
reside in fixed "(a)" and "(b)" subdirectories. This assumption, of
course, breaks many valid characters that don't use these magical
directory names, as it prepends them to every emote URL.

This commit removes this fossil. Animation, or any character structure
at all, shouldn't depend on magical subdirectory names, and instead
defined explicitly.
---
 webAO/viewport/viewport.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'webAO/viewport/viewport.ts')

diff --git a/webAO/viewport/viewport.ts b/webAO/viewport/viewport.ts
index 70ec5c5..1421c67 100644
--- a/webAO/viewport/viewport.ts
+++ b/webAO/viewport/viewport.ts
@@ -255,7 +255,7 @@ const viewport = (): Viewport => {
       if (chatmsg.preloadedAssets) {
         setEmoteFromUrl(chatmsg.preloadedAssets.idleUrl, false, chatmsg.side);
       } else {
-        setEmote(AO_HOST, client, charName, charEmote, "(a)", false, chatmsg.side);
+        setEmote(AO_HOST, client, charName, charEmote, false, chatmsg.side);
       }
       charLayers.style.opacity = "1";
       waitingBox.style.opacity = "1";
@@ -354,7 +354,7 @@ const viewport = (): Viewport => {
           setEmoteFromUrl(chatmsg.preloadedAssets.preanimUrl, false, chatmsg.side);
         } else {
           const preanim = chatmsg.preanim;
-          setEmote(AO_HOST, client, charName, preanim, "", false, chatmsg.side);
+          setEmote(AO_HOST, client, charName, preanim, false, chatmsg.side);
         }
       }
 
@@ -444,7 +444,7 @@ const viewport = (): Viewport => {
           if (chatmsg.preloadedAssets) {
             setEmoteFromUrl(chatmsg.preloadedAssets.pairIdleUrl, true, chatmsg.side);
           } else {
-            setEmote(AO_HOST, client, pairName, pairEmote, "(a)", true, chatmsg.side);
+            setEmote(AO_HOST, client, pairName, pairEmote, true, chatmsg.side);
           }
           pairLayers.style.opacity = "1";
         } else {
@@ -454,7 +454,7 @@ const viewport = (): Viewport => {
         if (chatmsg.preloadedAssets) {
           setEmoteFromUrl(chatmsg.preloadedAssets.talkingUrl, false, chatmsg.side);
         } else {
-          setEmote(AO_HOST, client, charName, charEmote, "(b)", false, chatmsg.side);
+          setEmote(AO_HOST, client, charName, charEmote, false, chatmsg.side);
         }
         charLayers.style.opacity = "1";
 
@@ -462,7 +462,7 @@ const viewport = (): Viewport => {
           if (chatmsg.preloadedAssets) {
             setEmoteFromUrl(chatmsg.preloadedAssets.idleUrl, false, chatmsg.side);
           } else {
-            setEmote(AO_HOST, client, charName, charEmote, "(a)", false, chatmsg.side);
+            setEmote(AO_HOST, client, charName, charEmote, false, chatmsg.side);
           }
           charLayers.style.opacity = "1";
           waitingBox.style.opacity = "1";
-- 
cgit