From 764a692a5e8c424d3afffbf299f4772167d3477f Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 25 Nov 2023 04:51:13 -0800
Subject: [PATCH] P_IsLocalPlayer, P_IsMachineLocalPlayer, P_IsDisplayPlayer:
let player pointer be const
---
src/p_local.h | 6 +++---
src/p_user.c | 6 +++---
src/s_sound.c | 2 +-
src/s_sound.h | 2 +-
src/y_inter.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/p_local.h b/src/p_local.h
index 90e56e610c..115ccc2efc 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -158,9 +158,9 @@ boolean P_PlayerInPain(player_t *player);
void P_ResetPlayer(player_t *player);
boolean P_PlayerCanDamage(player_t *player, mobj_t *thing);
-boolean P_IsLocalPlayer(player_t *player);
-boolean P_IsMachineLocalPlayer(player_t *player);
-boolean P_IsDisplayPlayer(player_t *player);
+boolean P_IsLocalPlayer(const player_t *player);
+boolean P_IsMachineLocalPlayer(const player_t *player);
+boolean P_IsDisplayPlayer(const player_t *player);
void P_SetPlayerAngle(player_t *player, angle_t angle);
void P_ForceLocalAngle(player_t *player, angle_t angle);
diff --git a/src/p_user.c b/src/p_user.c
index 3f9540ba39..b1a0fd3cde 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1026,7 +1026,7 @@ void P_SetObjectMomZ(mobj_t *mo, fixed_t value, boolean relative)
// Returns true if player is
// ACTUALLY on the local machine
//
-boolean P_IsMachineLocalPlayer(player_t *player)
+boolean P_IsMachineLocalPlayer(const player_t *player)
{
UINT8 i;
@@ -1051,7 +1051,7 @@ boolean P_IsMachineLocalPlayer(player_t *player)
// on the local machine
// (or simulated party)
//
-boolean P_IsLocalPlayer(player_t *player)
+boolean P_IsLocalPlayer(const player_t *player)
{
if (player == NULL)
{
@@ -1072,7 +1072,7 @@ boolean P_IsLocalPlayer(player_t *player)
// Returns true if player is
// currently being watched.
//
-boolean P_IsDisplayPlayer(player_t *player)
+boolean P_IsDisplayPlayer(const player_t *player)
{
UINT8 i;
diff --git a/src/s_sound.c b/src/s_sound.c
index 90cc11fb80..dfd3bb4fa8 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -613,7 +613,7 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
S_StartSoundAtVolume(origin, sfx_id, 255);
}
-void S_ReducedVFXSoundAtVolume(const void *origin, sfxenum_t sfx_id, INT32 volume, player_t *owner)
+void S_ReducedVFXSoundAtVolume(const void *origin, sfxenum_t sfx_id, INT32 volume, const player_t *owner)
{
if (S_SoundDisabled())
return;
diff --git a/src/s_sound.h b/src/s_sound.h
index 3ad5b65cc6..216dc1a55b 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -128,7 +128,7 @@ void S_StartSound(const void *origin, sfxenum_t sound_id);
void S_StartSoundAtVolume(const void *origin, sfxenum_t sound_id, INT32 volume);
// Will start a sound, but only if VFX reduce is off or the owner isn't a display player.
-void S_ReducedVFXSoundAtVolume(const void *origin, sfxenum_t sfx_id, INT32 volume, player_t *owner);
+void S_ReducedVFXSoundAtVolume(const void *origin, sfxenum_t sfx_id, INT32 volume, const player_t *owner);
#define S_ReducedVFXSound(a, b, c) S_ReducedVFXSoundAtVolume(a, b, 255, c)
// Stop sound for thing at <origin>
diff --git a/src/y_inter.c b/src/y_inter.c
index 2650ac526d..45b212993a 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -515,7 +515,7 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset)
returny = y;
- boolean (*_isHighlightedPlayer)(player_t *) =
+ boolean (*_isHighlightedPlayer)(const player_t *) =
(demo.playback
? P_IsDisplayPlayer
: P_IsLocalPlayer
--
GitLab