mirror of
https://github.com/Vikeo/LifeTrinket.git
synced 2025-11-17 00:08:01 +00:00
fix starting player referring to wrong value
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 =
|
||||
|
||||
@@ -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,
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user