thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-spectator-tally' into 'master'

Browse source 
Set viewpoint to own self when Tally starts

Closes #904 and #848

See merge request KartKrew/Kart!1813
This commit is contained in:
Oni 2024-01-14 07:44:33 +00:00
commit 7ad7afe1d9
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/k_tally.cpp
View file

@ -551,6 +551,16 @@ void level_tally_t::Init(player_t *player)
state = TALLY_ST_IGNORE; state = TALLY_ST_IGNORE;
delay = 0; delay = 0;
} }
if (UINT8 pnum = player - players; G_IsPartyLocal(pnum))
{
UINT8 view = G_PartyPosition(pnum);
// Battle: if this player's viewpoint has changed
// since being eliminated, set it back so they see
// their own Tally and not someone else's.
displayplayers[view] = pnum;
G_FixCamera(1 + view);
}
} }
void level_tally_t::NewLine(void) void level_tally_t::NewLine(void)
@ -1384,8 +1394,7 @@ void K_TickPlayerTally(player_t *player)
void K_DrawPlayerTally(void) void K_DrawPlayerTally(void)
{ {
// Draw the observer player's tally, not whoever they may be spectating stplyr->tally.Draw();
players[G_PartyMember(consoleplayer, R_GetViewNumber())].tally.Draw();
} }
boolean K_PlayerTallyActive(player_t *player) boolean K_PlayerTallyActive(player_t *player)