external-repos/LifeTrinket
1
0
Fork 1
mirror of https://github.com/Vikeo/LifeTrinket.git synced 2025-11-17 08:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix starting player referring to wrong value

Browse Source
This commit is contained in:
Viktor Rådberg
2023-09-27 20:04:29 +02:00
parent bcaab4fdb0
commit 38a6ed4493
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/LifeCounter/LifeCounter.tsx
View File

@@ -167,7 +167,7 @@ type LifeCounterProps = {
const LifeCounter = ({ player, opponents }: LifeCounterProps) => { const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
const { updatePlayer, updateLifeTotal } = usePlayers(); const { updatePlayer, updateLifeTotal } = usePlayers();
const { showStartingPlayer } = useGlobalSettings(); const { settings } = useGlobalSettings();
const [showPlayerMenu, setShowPlayerMenu] = useState(false); const [showPlayerMenu, setShowPlayerMenu] = useState(false);
const [recentDifference, setRecentDifference] = useState(0); const [recentDifference, setRecentDifference] = useState(0);
@@ -211,7 +211,7 @@ const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
return ( return (
<LifeCounterContentWrapper $backgroundColor={player.color}> <LifeCounterContentWrapper $backgroundColor={player.color}>
<LifeCounterWrapper $rotation={player.settings.rotation}> <LifeCounterWrapper $rotation={player.settings.rotation}>
{showStartingPlayer && {settings.showStartingPlayer &&
player.isStartingPlayer && player.isStartingPlayer &&
player.showStartingPlayer && ( player.showStartingPlayer && (
<PlayerNoticeWrapper <PlayerNoticeWrapper

2
src/Contexts/GlobalSettingsContext.tsx
View File

@@ -22,8 +22,6 @@ export type GlobalSettingsContextType = {
setInitialGameSettings: (initialGameSettings: InitialGameSettings) => void; setInitialGameSettings: (initialGameSettings: InitialGameSettings) => void;
settings: Settings; settings: Settings;
setSettings: (settings: Settings) => void; setSettings: (settings: Settings) => void;
showStartingPlayer: boolean;
setShowStartingPlayer: (showStartingPlayer: boolean) => void;
}; };
export const GlobalSettingsContext = export const GlobalSettingsContext =

4
src/Providers/GlobalSettingsProvider.tsx
View File

@@ -21,7 +21,6 @@ export const GlobalSettingsProvider = ({
const [showPlay, setShowPlay] = useState<boolean>( const [showPlay, setShowPlay] = useState<boolean>(
savedShowPlay ? savedShowPlay === 'true' : false savedShowPlay ? savedShowPlay === 'true' : false
); );
const [showStartingPlayer, setShowStartingPlayer] = useState(true);
const [initialGameSettings, setInitialGameSettings] = const [initialGameSettings, setInitialGameSettings] =
useState<InitialGameSettings | null>( useState<InitialGameSettings | null>(
@@ -137,8 +136,6 @@ export const GlobalSettingsProvider = ({
setInitialGameSettings, setInitialGameSettings,
settings, settings,
setSettings, setSettings,
showStartingPlayer,
setShowStartingPlayer,
}; };
}, [ }, [
active, active,
@@ -150,7 +147,6 @@ export const GlobalSettingsProvider = ({
request, request,
settings, settings,
showPlay, showPlay,
showStartingPlayer,
type, type,
]); ]);