From 41a66ac50a1ed73ae1913855945baf847be1fbbb Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Fri, 10 May 2019 15:28:39 -0400 Subject: [PATCH] Use IsDisplayPlayer for more things Makes viewpoints in spectating/demos do client-side effects a little better --- src/p_mobj.c | 2 +- src/p_spec.c | 4 ++-- src/p_user.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 7ffc8355f..e5f8bc65f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6702,7 +6702,7 @@ void P_MobjThinker(mobj_t *mobj) if ((G_RaceGametype() || mobj->target->player->kartstuff[k_bumper] <= 0) #if 1 // Set to 0 to test without needing to host - || ((mobj->target->player == &players[displayplayers[0]]) || P_IsLocalPlayer(mobj->target->player)) + || (P_IsDisplayPlayer(mobj->target->player)) #endif ) mobj->flags2 |= MF2_DONTDRAW; diff --git a/src/p_spec.c b/src/p_spec.c index 8f43231db..a0f967e4f 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -4242,7 +4242,7 @@ DoneSection2: player->starpostangle = player->starpostx = player->starposty = player->starpostz = player->kartstuff[k_starpostflip] = 0; } - if (P_IsLocalPlayer(player)) + if (P_IsDisplayPlayer(player)) { if (player->laps == (UINT8)(cv_numlaps.value - 1)) S_StartSound(NULL, sfx_s3k68); @@ -4272,7 +4272,7 @@ DoneSection2: if (player->laps >= (unsigned)cv_numlaps.value) { - if (P_IsLocalPlayer(player)) + if (P_IsDisplayPlayer(player)) S_StartSound(NULL, sfx_s3k6a); else if (player->kartstuff[k_position] == 1) S_StartSound(NULL, sfx_s253); diff --git a/src/p_user.c b/src/p_user.c index d4e6a03de..ab14d1d49 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1674,7 +1674,7 @@ void P_DoPlayerExit(player_t *player) if (cv_kartvoices.value) { - if (P_IsLocalPlayer(player)) + if (P_IsDisplayPlayer(player)) { sfxenum_t sfx_id; if (K_IsPlayerLosing(player))