fix starting player referring to wrong value

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

View File

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

View File

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

View File

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