fix: in game chat

src/main/Connection.ts

@@ -545,7 +545,7 @@ export class Connection {
     if (!message || senderId == null) return
     switch (chat.chatType) {
       case Chat.ChatType.GLOBAL:
-        if (emulator!.inGameChatEnabled) {
+        if (connector.inGameChatEnabled) {
           emulator!.displayChatMessage(message)
         }
         connector.globalChatMessage(message, senderId)

src/main/Connector.ts

@@ -20,11 +20,14 @@ export class Connector {
     ipcMain.on(RendererMessage.PASSWORD, this.onSendPassword)
     ipcMain.on(RendererMessage.CHAT_GLOBAL, this.onSendGlobalChatMessage)
     ipcMain.on(RendererMessage.CHAT_COMMAND, this.onSendCommandMessage)
+    ipcMain.on(RendererMessage.EMU_CHAT, this.onEmuChatChanged)
     ipcMain.on(RendererMessage.HOTKEYS_CHANGED, this.onHotkeysChanged)
     ipcMain.on(RendererMessage.CHARACTER_CYCLING_ORDER_CHANGED, this.onCharacterCyclingOrderChanged)
     ipcMain.on(RendererMessage.GAMEPAD_BUTTON_STATE_CHANGED, this.onGamepadButtonStateChanged)
   }
 
+  public inGameChatEnabled = false
+
   private hotkeyManager = new HotkeyManager()
 
   private readonly onCreateConnection = (
@@ -50,10 +53,10 @@ export class Connector {
 
   private readonly onCreateEmulatorConnection = (
     _: Electron.Event,
-    { processId, characterId, inGameChatEnabled }:
-    { processId: number, characterId: number, inGameChatEnabled: boolean }
+    { processId, characterId }:
+    { processId: number, characterId: number }
   ) => {
-    createEmulator({ processId, characterId, inGameChatEnabled })
+    createEmulator({ processId, characterId })
   }
 
   private readonly onDisconnectEmulator = () => {
@@ -81,6 +84,12 @@ export class Connector {
     this.onPlayerUpdate({} as any, { username, characterId })
   }
 
+  private readonly onEmuChatChanged = (
+    _: Electron.Event,
+    { emuChat }: { emuChat: boolean}) => {
+    this.inGameChatEnabled = emuChat
+  }
+
   private readonly onHotkeysChanged = (
     _: Electron.Event,
     { hotkeyBindings, globalHotkeysEnabled, username }:

src/main/Emulator.ts

@@ -31,8 +31,6 @@ enum ConnectionFlag {
 export class Emulator {
   public baseAddress: number
 
-  public inGameChatEnabled = false
-
   private readonly process: Process
 
   public static async updateEmulators () {
@@ -115,10 +113,8 @@ export class Emulator {
    *
    * @param {number} processId - Process ID to load
    * @param {number} characterId - Character ID from settings
-   * @param {boolean} [inGameChatEnabled=false] - Whether in game chat should be enabled
    */
-  constructor (processId: number, characterId: number, inGameChatEnabled = false) {
-    this.inGameChatEnabled = inGameChatEnabled
+  constructor (processId: number, characterId: number) {
     this.process = processId === testEmulatorPid ? new TestProcess() : winProcess.Process(processId)
     this.process.open()
     this.baseAddress = -1

src/main/index.ts

@@ -21,11 +21,11 @@ export let emulator: Emulator | undefined
 export let connection: Connection | undefined
 
 export const createEmulator = (
-  { processId, characterId, inGameChatEnabled }:
-  { processId: number, characterId: number, inGameChatEnabled: boolean }
+  { processId, characterId }:
+  { processId: number, characterId: number }
 ) => {
   try {
-    emulator = new Emulator(processId, characterId, inGameChatEnabled)
+    emulator = new Emulator(processId, characterId)
     emulator.displayChatMessage('- Net64 connected -')
   } catch (err) {
     console.warn(err)

src/models/Message.model.ts

@@ -31,6 +31,7 @@ export enum RendererMessage {
   PASSWORD = 'PASSWORD',
   CHAT_GLOBAL = 'CHAT_GLOBAL',
   CHAT_COMMAND = 'CHAT_COMMAND',
+  EMU_CHAT = 'EMU_CHAT',
   HOTKEYS_CHANGED = 'HOTKEYS_CHANGED',
   CHARACTER_CYCLING_ORDER_CHANGED = 'CHARACTER_CYCLING_ORDER_CHANGED',
   GAMEPAD_BUTTON_STATE_CHANGED = 'GAMEPAD_BUTTON_STATE_CHANGED'

src/renderer/Connector.ts

@@ -198,10 +198,10 @@ is incompatible with your client API version (${process.env.MAJOR}.${process.env
   }
 
   public createEmulatorConnection (
-    { processId, characterId, inGameChatEnabled }:
-    { processId: number, characterId: number, inGameChatEnabled: boolean }
+    { processId, characterId }:
+    { processId: number, characterId: number }
   ): void {
-    ipcRenderer.send(RendererMessage.CREATE_EMULATOR_CONNECTION, { processId, characterId, inGameChatEnabled })
+    ipcRenderer.send(RendererMessage.CREATE_EMULATOR_CONNECTION, { processId, characterId })
   }
 
   public disconnectEmulator (): void {
@@ -224,6 +224,10 @@ is incompatible with your client API version (${process.env.MAJOR}.${process.env
     ipcRenderer.send(RendererMessage.CHAT_COMMAND, { message, args })
   }
 
+  public changeEmuChat (emuChat: boolean): void {
+    ipcRenderer.send(RendererMessage.EMU_CHAT, { emuChat })
+  }
+
   public changeHotkeyBindings (
     { hotkeyBindings, globalHotkeysEnabled, username }:
     { hotkeyBindings: { [shortcut in HotkeyShortcut]: string[] }, globalHotkeysEnabled: boolean, username?: string }

src/renderer/components/views/EmulatorView.tsx

@@ -96,8 +96,7 @@ class View extends React.PureComponent<EmulatorViewProps, EmulatorViewState> {
     setTimeout(() => {
       connector.createEmulatorConnection({
         processId: emulator.pid,
-        characterId: this.props.characterId,
-        inGameChatEnabled: false
+        characterId: this.props.characterId
       })
     }, 50)
     this.timerTimeout = setTimeout(() => {

src/renderer/components/views/SettingsView.scss

@@ -15,6 +15,11 @@
     flex: 0
   }
 
+  &-setting {
+    width: 100%;
+    display: flex;
+  }
+
   &-hotkeys {
     display: flex;
     flex-wrap: wrap;

src/renderer/components/views/SettingsView.tsx

@@ -164,6 +164,7 @@ class View extends React.PureComponent<SettingsViewProps, SettingsViewState> {
     } else {
       const { dispatch } = this.props
       connector.playerUpdate({ username, characterId: this.state.characterId })
+      connector.changeEmuChat(this.state.emuChat)
       connector.changeHotkeyBindings({ hotkeyBindings, globalHotkeysEnabled })
       connector.changeCharacterCyclingOrder({ characterCyclingOrder })
       dispatch(setUsername(username))
@@ -197,10 +198,6 @@ class View extends React.PureComponent<SettingsViewProps, SettingsViewState> {
     const connectionError = this.props.connectionError
     const gamepads = gamepadManager.getConnectedGamepads()
     const styles: Record<string, React.CSSProperties> = {
-      setting: {
-        width: '100%',
-        display: 'flex'
-      },
       flexCenter: {
         alignItems: 'center',
         justifyContent: 'center'
@@ -231,12 +228,12 @@ class View extends React.PureComponent<SettingsViewProps, SettingsViewState> {
           <WarningPanel warning={connectionError} />
         }
 
-        <div style={styles.setting}>
+        <div className='settings-view-setting'>
           <div style={styles.label}>Username:</div>
           <input style={styles.input} value={this.state.username} onChange={this.onUsernameChange} />
         </div>
 
-        <div style={styles.setting}>
+        <div className='settings-view-setting'>
           <div style={styles.label}>Character:</div>
           <select style={styles.input} value={this.state.characterId} onChange={this.onCharacterChange}>
             <option value='0'>Mario</option>
@@ -254,7 +251,7 @@ class View extends React.PureComponent<SettingsViewProps, SettingsViewState> {
           </select>
         </div>
 
-        <div style={styles.setting}>
+        <div className='settings-view-setting'>
           <div style={styles.label}>Gamepad:</div>
           <select style={styles.input} value={gamepadId ?? undefined} onChange={(e) => {
             gamepadManager.selectedGamepad = gamepadManager.getConnectedGamepads().find((gamepad) =>
@@ -274,14 +271,17 @@ class View extends React.PureComponent<SettingsViewProps, SettingsViewState> {
           </select>
         </div>
 
-        <div style={styles.setting}>
+        <div className='settings-view-setting'>
           <div style={styles.label}>In-Game Chat View:</div>
           <input
             style={styles.checkBox}
             type='checkbox'
             checked={this.state.emuChat}
             onChange={this.onEmuChatChange}
           />
+        </div>
+
+        <div className='settings-view-setting'>
           <div style={styles.label}>Enable global character keyboard shortcuts:</div>
           <input
             style={styles.checkBox}

src/renderer/index.tsx

@@ -23,9 +23,11 @@ export let store: Store<State>
 export const connector = new Connector()
 export let gamepadManager: GamepadManager
 
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
 ;(async () => {
   const history: History = createHistory()
   const save: SaveState = await loadSaveData()
+  connector.changeEmuChat(save.appSaveData.emuChat)
   connector.changeHotkeyBindings({
     hotkeyBindings: save.appSaveData.hotkeyBindings || {},
     globalHotkeysEnabled: !!save.appSaveData.globalHotkeysEnabled,