From 6bf9f994b5736397094920bac001b0b2f0efa82d Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 10 Jan 2024 23:01:44 -0800 Subject: [PATCH 1/2] Revert "HUD: draw tally of party member, not whoever may being spectated" This reverts commit dfd43014c6f8addbb194b5030dd6e778ecd6872f. --- src/k_tally.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/k_tally.cpp b/src/k_tally.cpp index 2c303ea60..b1de6e33e 100644 --- a/src/k_tally.cpp +++ b/src/k_tally.cpp @@ -34,7 +34,6 @@ #include "s_sound.h" #include "st_stuff.h" #include "r_fps.h" -#include "g_party.h" boolean level_tally_t::UseBonuses(void) { @@ -1384,8 +1383,7 @@ void K_TickPlayerTally(player_t *player) void K_DrawPlayerTally(void) { - // Draw the observer player's tally, not whoever they may be spectating - players[G_PartyMember(consoleplayer, R_GetViewNumber())].tally.Draw(); + stplyr->tally.Draw(); } boolean K_PlayerTallyActive(player_t *player) From f9e943b118463822517f86d4a92570c0fefef3e7 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 10 Jan 2024 23:24:08 -0800 Subject: [PATCH 2/2] Set displayplayer to own self when Tally starts --- src/k_tally.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/k_tally.cpp b/src/k_tally.cpp index b1de6e33e..0e868e082 100644 --- a/src/k_tally.cpp +++ b/src/k_tally.cpp @@ -34,6 +34,7 @@ #include "s_sound.h" #include "st_stuff.h" #include "r_fps.h" +#include "g_party.h" boolean level_tally_t::UseBonuses(void) { @@ -550,6 +551,16 @@ void level_tally_t::Init(player_t *player) state = TALLY_ST_IGNORE; 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)