Merge pull request #175 from caleb-mabry/more-function-removal-viewport

More function removal from viewport

2 files changed, 8 insertions, 7 deletions

diff --git a/webAO/packets/handlers/handleMS.ts b/webAO/packets/handlers/handleMS.ts
index 1256900..92d65db 100644
--- a/webAO/packets/handlers/handleMS.ts
+++ b/webAO/packets/handlers/handleMS.ts
@@ -2,14 +2,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'
 /**
    * 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.chatmsg.content) {
+  if (args[4] !== client.viewport.getChatmsg().content) {
     document.getElementById("client_inner_chat")!.innerHTML = "";
 
     const char_id = Number(args[9]);
@@ -55,7 +55,7 @@ export const handleMS = (args: string[]) => {
 
     if (char_muted === false) {
       let chatmsg = {
-        deskmod: safeTags(args[1]).toLowerCase(),
+        deskmod: Number(safeTags(args[1]).toLowerCase()),
         preanim: safeTags(args[2]).toLowerCase(), // get preanim
         nameplate: msg_nameplate,
         chatbox: char_chatbox,
@@ -69,7 +69,7 @@ export const handleMS = (args: string[]) => {
         charid: char_id,
         snddelay: Number(args[10]),
         objection: Number(args[11]),
-        evidence: safeTags(args[12]),
+        evidence: Number(safeTags(args[12])),
         flip: Number(args[13]),
         flash: Number(args[14]),
         color: Number(args[15]),
@@ -158,7 +158,8 @@ export const handleMS = (args: string[]) => {
       if (chatmsg.charid === client.charID) {
         resetICParams();
       }
-      client.viewport.handle_ic_speaking(chatmsg); // no await
+
+      handle_ic_speaking(chatmsg); // no await
     }
   }
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleRT.ts b/webAO/packets/handlers/handleRT.ts
index 5bbf2b2..62ebb1e 100644
--- a/webAO/packets/handlers/handleRT.ts
+++ b/webAO/packets/handlers/handleRT.ts
@@ -1,5 +1,5 @@
 import { client } from "../../client";
-
+import { initTestimonyUpdater } from '../../viewport/utils/initTestimonyUpdater'
 
 /**
   * Handles a testimony states.
@@ -21,5 +21,5 @@ export const handleRT = (args: string[]) => {
         default:
             console.warn("Invalid testimony");
     }
-    client.viewport.initTestimonyUpdater();
+    initTestimonyUpdater();
 }
\ No newline at end of file