2 files changed, 6 insertions, 4 deletions
diff --git a/webAO/client/loadResources.ts b/webAO/client/loadResources.ts
index 65d0895..4954966 100644
--- a/webAO/client/loadResources.ts
+++ b/webAO/client/loadResources.ts
@@ -1,12 +1,14 @@
 import getCookie from "../utils/getCookie";
 import vanilla_evidence_arr from "../constants/evidence.js";
 import vanilla_background_arr from "../constants/backgrounds.js";
-import { client } from "../client";
+import { changeMusicVolume } from '../dom/changeMusicVolume'
 import { setChatbox } from "../dom/setChatbox";
 import { changeSFXVolume, changeShoutVolume, changeTestimonyVolume } from "../dom/changeVolume";
 import { showname_click } from "../dom/showNameClick";
 import { changeBlipVolume } from '../dom/changeBlipVolume'
+import { reloadTheme } from '../dom/reloadTheme'
 const version = process.env.npm_package_version;
+
 /**
    * Load game resources and stored settings.
    */
@@ -41,7 +43,7 @@ export const loadResources = () => {
     (<HTMLOptionElement>(
         document.querySelector(`#client_themeselect [value="${cookietheme}"]`)
     )).selected = true;
-    client.viewport.reloadTheme();
+    reloadTheme();
 
     const cookiechatbox = getCookie("chatbox") || "dynamic";
 
@@ -52,7 +54,7 @@ export const loadResources = () => {
 
     (<HTMLInputElement>document.getElementById("client_mvolume")).value =
         getCookie("musicVolume") || "1";
-    client.viewport.changeMusicVolume();
+    changeMusicVolume();
     (<HTMLAudioElement>document.getElementById("client_sfxaudio")).volume =
         Number(getCookie("sfxVolume")) || 1;
     changeSFXVolume();
diff --git a/webAO/client/setEmote.ts b/webAO/client/setEmote.ts
index 161eb51..f4fbdbb 100644
--- a/webAO/client/setEmote.ts
+++ b/webAO/client/setEmote.ts
@@ -28,7 +28,7 @@ const setEmote = async (
   for (const extension of extensionsMap) {
     // Hides all sprites before creating a new sprite
 
-    if (client.viewport.lastChar !== client.viewport.chatmsg.name) {
+    if (client.viewport.getLastCharacter() !== client.viewport.getChatmsg().name) {
       emoteSelector.src = transparentPng;
     }
     let url;