diff options
| author | stonedDiscord <Tukz@gmx.de> | 2024-09-29 19:32:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-29 19:32:44 +0200 |
| commit | 0557ccf3d78e36773d9845e7054d97c9d505594f (patch) | |
| tree | 8cfd3e95088747483a98745e6f96569ca64fd208 /webAO | |
| parent | 992383686efaf4ec30944ac46d7775fd9ad5c16e (diff) | |
| parent | 7ef85f836cd75f668d4c555a88d791f35574b38d (diff) | |
Merge pull request #242 from caleb-mabry/fix-additive
Fix Additive
Diffstat (limited to 'webAO')
| -rw-r--r-- | webAO/packets/handlers/handleMS.ts | 10 | ||||
| -rw-r--r-- | webAO/viewport/utils/handleICSpeaking.ts | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/webAO/packets/handlers/handleMS.ts b/webAO/packets/handlers/handleMS.ts index 1c30d55..0c54a57 100644 --- a/webAO/packets/handlers/handleMS.ts +++ b/webAO/packets/handlers/handleMS.ts @@ -4,16 +4,14 @@ import { client, extrafeatures, UPDATE_INTERVAL } from "../../client"; import { handleCharacterInfo } from "../../client/handleCharacterInfo"; import { resetICParams } from "../../client/resetICParams"; import { prepChat, safeTags } from "../../encoding"; -import { handle_ic_speaking } from '../../viewport/utils/handleICSpeaking' +import { handle_ic_speaking } from "../../viewport/utils/handleICSpeaking"; /** - * Handles an in-character chat message. - * @param {*} args packet arguments - */ + * Handles an in-character chat message. + * @param {*} args packet arguments + */ export const handleMS = (args: string[]) => { // TODO: this if-statement might be a bug. if (args[4] !== client.viewport.getChatmsg().content) { - document.getElementById("client_inner_chat")!.innerHTML = ""; - const char_id = Number(args[9]); const char_name = safeTags(args[3]); diff --git a/webAO/viewport/utils/handleICSpeaking.ts b/webAO/viewport/utils/handleICSpeaking.ts index 4fe68d3..d5bd29f 100644 --- a/webAO/viewport/utils/handleICSpeaking.ts +++ b/webAO/viewport/utils/handleICSpeaking.ts @@ -78,7 +78,9 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { : client.viewport.getChatmsg().nameplate!; // Clear out the last message - chatBoxInner.innerText = client.viewport.getTextNow(); + if (!client.viewport.getChatmsg().additive) { + chatBoxInner.innerText = client.viewport.getTextNow(); + } nameBoxInner.innerText = displayname; if (client.viewport.getLastCharacter() !== client.viewport.getChatmsg().name) { |
