merge manual and computed state

[alttp.git] / resources / js / components / tracker / AutoTracking.js

diff --git a/resources/js/components/tracker/AutoTracking.js b/resources/js/components/tracker/AutoTracking.js
index 8528856bf430ef3901817fa53478092d3620d3da..dfa1972f6c020561c8e3fadc635b71f2348a4935 100644 (file)
--- a/resources/js/components/tracker/AutoTracking.js
+++ b/resources/js/components/tracker/AutoTracking.js
@@ -11,7 +11,7 @@ import {
        WRAM_ADDR,
        buildPrizeMap,
 } from '../../helpers/alttp-ram';
-import { computeState, mergeStates } from '../../helpers/tracker';
+import { computeState } from '../../helpers/tracker';
 import { useSNES } from '../../hooks/snes';
 import { useTracker } from '../../hooks/tracker';
 
@@ -26,7 +26,7 @@ const AutoTracking = () => {
                sock,
                status,
        } = useSNES();
-       const { config, setState } = useTracker();
+       const { config, setAutoState } = useTracker();
        const { t } = useTranslation();
 
        const enable = React.useCallback(() => {
@@ -74,8 +74,8 @@ const AutoTracking = () => {
                        const saveStart = WRAM_ADDR.SAVE_DATA;
                        const saveSize = SRAM_ADDR.INV_END;
                        sock.current.readWRAM(saveStart, saveSize, (data) => {
-                               const computed = computeState(data, prizeMap);
-                               setState(s => mergeStates(config, s, computed));
+                               const computed = computeState(config, data, prizeMap);
+                               setAutoState(computed);
                        });
                };
                const fetchPrizes = () => {
@@ -118,7 +118,7 @@ const AutoTracking = () => {
                return 'tracking';
        }, [enabled, status]);
 
-       return <div>
+       return <div className="auto-tracking">
                {['disconnected', 'error', 'no-device'].includes(statusMsg) ?
                        <Icon.WARNING
                                className="me-2 text-warning"