diff --git a/src/Components/Players/PlayerMenu.tsx b/src/Components/Players/PlayerMenu.tsx index 784f02a..74bbffe 100644 --- a/src/Components/Players/PlayerMenu.tsx +++ b/src/Components/Players/PlayerMenu.tsx @@ -123,6 +123,7 @@ const PlayerMenu = ({ saveCurrentGame, initialGameSettings, setPreStartCompleted, + gameScore, } = useGlobalSettings(); const analytics = useAnalytics(); @@ -165,7 +166,7 @@ const PlayerMenu = ({ }; const handleGoToStart = () => { - saveCurrentGame({ players, initialGameSettings }); + saveCurrentGame({ players, initialGameSettings, gameScore }); goToStart(); setRandomizingPlayer(true); }; diff --git a/src/Components/Views/StartMenu/StartMenu.tsx b/src/Components/Views/StartMenu/StartMenu.tsx index d13f6cb..b820544 100644 --- a/src/Components/Views/StartMenu/StartMenu.tsx +++ b/src/Components/Views/StartMenu/StartMenu.tsx @@ -64,6 +64,7 @@ const Start = () => { setPlaying, savedGame, saveCurrentGame, + setGameScore, } = useGlobalSettings(); const infoDialogRef = useRef(null); @@ -213,6 +214,9 @@ const Start = () => { setInitialGameSettings(savedGame.initialGameSettings); setPlayers(savedGame.players); + if (savedGame.gameScore) { + setGameScore(savedGame.gameScore); + } saveCurrentGame(null); setRandomizingPlayer(false); setShowPlay(true); @@ -407,15 +411,31 @@ const Start = () => { {savedGame && ( )} diff --git a/src/Contexts/GlobalSettingsContext.tsx b/src/Contexts/GlobalSettingsContext.tsx index 15f0ad2..813db6b 100644 --- a/src/Contexts/GlobalSettingsContext.tsx +++ b/src/Contexts/GlobalSettingsContext.tsx @@ -12,6 +12,7 @@ type Version = { export type SavedGame = { initialGameSettings: InitialGameSettings; players: Player[]; + gameScore?: GameScore; } | null; export type GameScore = {