diff options
| -rw-r--r-- | webAO/packets/handlers/handleMC.ts | 11 | ||||
| -rw-r--r-- | webAO/viewport/utils/handleICSpeaking.ts | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/webAO/packets/handlers/handleMC.ts b/webAO/packets/handlers/handleMC.ts index c92a818..8a1c0a2 100644 --- a/webAO/packets/handlers/handleMC.ts +++ b/webAO/packets/handlers/handleMC.ts @@ -11,7 +11,7 @@ export const handleMC = (args: string[]) => { const track = prepChat(args[1]); let charID = Number(args[2]); const showname = args[3] || ""; - const looping = Boolean(args[4]); + const looping = Boolean(Number(args[4])) || false; const channel = Number(args[5]) || 0; // const fading = Number(args[6]) || 0; // unused in web @@ -32,11 +32,16 @@ export const handleMC = (args: string[]) => { charID = -1; } + let looptext = ""; + + if (looping) + looptext = "(looping)"; + if (charID >= 0) { musicname = client.chars[charID].name; - appendICLog(`${musicname} changed music to ${track}`); + appendICLog(`${musicname} changed music to ${track} ${looptext}`,showname); } else { - appendICLog(`The music was changed to ${track}`); + appendICLog(`The music was changed to ${track} ${looptext}`,showname); } document.getElementById("client_trackstatustext")!.innerText = track; diff --git a/webAO/viewport/utils/handleICSpeaking.ts b/webAO/viewport/utils/handleICSpeaking.ts index bae4986..b037e69 100644 --- a/webAO/viewport/utils/handleICSpeaking.ts +++ b/webAO/viewport/utils/handleICSpeaking.ts @@ -168,7 +168,8 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { if ( client.viewport.getChatmsg().type === 1 && - client.viewport.getChatmsg().preanim !== "-" + client.viewport.getChatmsg().preanim !== "-" && + client.viewport.getChatmsg().preanim !== "" ) { //we have a preanim chatContainerBox.style.opacity = "0"; |