diff options
Diffstat (limited to 'webAO/viewport/utils/preloadMessageAssets.ts')
| -rw-r--r-- | webAO/viewport/utils/preloadMessageAssets.ts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/webAO/viewport/utils/preloadMessageAssets.ts b/webAO/viewport/utils/preloadMessageAssets.ts index f3924cd..aeae191 100644 --- a/webAO/viewport/utils/preloadMessageAssets.ts +++ b/webAO/viewport/utils/preloadMessageAssets.ts @@ -18,7 +18,6 @@ function buildEmoteUrls( extensions: string[], charactername: string, emotename: string, - prefix: string, ): string[] { const characterFolder = `${AO_HOST}characters/`; const urls: string[] = []; @@ -30,7 +29,7 @@ function buildEmoteUrls( } else if (extension === ".webp.static") { url = `${characterFolder}${encodeURI(charactername)}/${encodeURI(emotename)}.webp`; } else { - url = `${characterFolder}${encodeURI(charactername)}/${encodeURI(prefix)}${encodeURI(emotename)}${extension}`; + url = `${characterFolder}${encodeURI(charactername)}/${encodeURI(emotename)}${extension}`; } urls.push(url); } @@ -66,8 +65,8 @@ export default async function preloadMessageAssets( const doPreload = async (): Promise<PreloadedAssets> => { // Build candidate URL lists for each emote - const idleUrls = buildEmoteUrls(AO_HOST, emoteExtensions, charName, charEmote, "(a)"); - const talkingUrls = buildEmoteUrls(AO_HOST, emoteExtensions, charName, charEmote, "(b)"); + const idleUrls = buildEmoteUrls(AO_HOST, emoteExtensions, charName, charEmote); + const talkingUrls = buildEmoteUrls(AO_HOST, emoteExtensions, charName, charEmote); const hasPreanim = chatmsg.type === 1 && @@ -76,12 +75,12 @@ export default async function preloadMessageAssets( chatmsg.preanim !== ""; const preanimUrls = hasPreanim - ? buildEmoteUrls(AO_HOST, emoteExtensions, charName, chatmsg.preanim!, "") + ? buildEmoteUrls(AO_HOST, emoteExtensions, charName, chatmsg.preanim!) : null; const hasPair = !!chatmsg.other_name; const pairIdleUrls = hasPair - ? buildEmoteUrls(AO_HOST, emoteExtensions, chatmsg.other_name!, chatmsg.other_emote!, "(a)") + ? buildEmoteUrls(AO_HOST, emoteExtensions, chatmsg.other_name!, chatmsg.other_emote!) : null; // Shout SFX per-character path |